nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Tobias Geerinckx-Rice 2017-07-14 20:47:38 +02:00
parent 70e7367df1
commit 0862b95433
No known key found for this signature in database
GPG Key ID: 91CCDB9B48541B99
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/build/vm.scm
View File

@ -354,7 +354,7 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation."
(error "failed to create GRUB EFI image")))) (error "failed to create GRUB EFI image"))))
(define* (make-iso9660-image grub config-file os-drv target (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 "Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as
Grub configuration and OS-DRV as the stuff in it." Grub configuration and OS-DRV as the stuff in it."
(let ((grub-mkrescue (string-append grub "/bin/grub-mkrescue"))) (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 ;; Create a tiny configuration file telling the embedded grub
;; where to load the real thing. ;; 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 (call-with-output-file grub-config
(lambda (port) (lambda (port)
(format port (format port
"insmod part_msdos~@ "insmod part_msdos~@
search --set=root --label GuixSD~@ search --set=root --label GuixSD_image~@
configfile /boot/grub/grub.cfg~%"))) configfile /boot/grub/grub.cfg~%")))
(display "creating EFI firmware image...") (display "creating EFI firmware image...")

2
gnu/system/install.scm
View File

@ -306,7 +306,7 @@ Use Alt-F2 for documentation.
;; the appropriate one. ;; the appropriate one.
(cons* (file-system (cons* (file-system
(mount-point "/") (mount-point "/")
(device "GuixSD") (device "GuixSD_image")
(title 'label) (title 'label)
(type "ext4")) (type "ext4"))

2
gnu/system/vm.scm
View File

@ -345,7 +345,7 @@ to USB sticks meant to be read-only."
;; Volume name of the root file system. Since we don't know which device ;; Volume name of the root file system. Since we don't know which device
;; will hold it, we use the volume name to find it (using the UUID would ;; will hold it, we use the volume name to find it (using the UUID would
;; be even better, but somewhat less convenient.) ;; be even better, but somewhat less convenient.)
(normalize-label "GuixSD")) (normalize-label "GuixSD_image"))
(define file-systems-to-keep (define file-systems-to-keep
(remove (lambda (fs) (remove (lambda (fs)