summaryrefslogtreecommitdiff
path: root/gnu/build
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2017-07-14 20:47:38 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2017-07-17 20:20:24 +0200
commit0862b95433cacf91e44248097caa09119fc532a6 (patch)
tree63c2c3152053e838f474d5a521e673a2e1d378b5 /gnu/build
parent70e7367df103f3ef1c80236c3a9a418d52bbb82e (diff)
downloadpatches-0862b95433cacf91e44248097caa09119fc532a6.tar
patches-0862b95433cacf91e44248097caa09119fc532a6.tar.gz
build, vm: Use a less common label.
* gnu/build/vm.scm (initialize-hard-disk): Use "GuixSD_image" as label. * gnu/system/install.scm (installation-os): Likewise. * gnu/system/vm.scm (system-disk-image): Likewise.
Diffstat (limited to 'gnu/build')
-rw-r--r--gnu/build/vm.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index d8c53ef37f..086f38ade1 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -354,7 +354,7 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation."
(error "failed to create GRUB EFI image"))))
(define* (make-iso9660-image grub config-file os-drv target
- #:key (volume-id "GuixSD") (volume-uuid #f))
+ #:key (volume-id "GuixSD_image") (volume-uuid #f))
"Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as
Grub configuration and OS-DRV as the stuff in it."
(let ((grub-mkrescue (string-append grub "/bin/grub-mkrescue")))
@@ -440,11 +440,14 @@ passing it a directory name where it is mounted."
;; Create a tiny configuration file telling the embedded grub
;; where to load the real thing.
+ ;; XXX This is quite fragile, and can prevent the image from booting
+ ;; when there's more than one volume with this label present.
+ ;; Reproducible almost-UUIDs could reduce the risk (not eliminate it).
(call-with-output-file grub-config
(lambda (port)
(format port
"insmod part_msdos~@
- search --set=root --label GuixSD~@
+ search --set=root --label GuixSD_image~@
configfile /boot/grub/grub.cfg~%")))
(display "creating EFI firmware image...")