diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-03-14 16:30:19 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-14 16:30:19 +0100 |
commit | 19008a22d18e772062952034c58a15ed341df3b5 (patch) | |
tree | 3a7fb9b4abe5cbac3f7edd5d5c76abd993fad255 /gnu/build/vm.scm | |
parent | 520ae432d446010ed6a5233c8abfda88a945926c (diff) | |
parent | c958c31caefb20c32cf89caea7d4668d7021a92b (diff) | |
download | guix-19008a22d18e772062952034c58a15ed341df3b5.tar.gz |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/build/vm.scm')
-rw-r--r-- | gnu/build/vm.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 0aef73d26d..6d6a0c4cb4 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org> ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> @@ -422,7 +422,7 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation." (string-append "boot/grub/grub.cfg=" config-file)))) (define* (make-iso9660-image grub config-file os-drv target - #:key (volume-id "GuixSD_image") (volume-uuid #f) + #:key (volume-id "Guix_image") (volume-uuid #f) register-closures? (closures '())) "Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as GRUB configuration and OS-DRV as the stuff in it." @@ -550,7 +550,7 @@ passing it a directory name where it is mounted." (lambda (port) (format port "insmod part_msdos~@ - search --set=root --label GuixSD_image~@ + search --set=root --label Guix_image~@ configfile /boot/grub/grub.cfg~%"))) (display "creating EFI firmware image...") |