me
/
guix
Archived
1
0
Fork 0
Code

build, vm: Use "GuixSD" or "GUIXSD" as volume label. 

* gnu/build/vm.scm (initialize-hard-disk): Use "GuixSD" as label.
* gnu/system/install.scm (installation-os): Use "GuixSD" as label.
* gnu/system/vm.scm (system-disk-image): Use "GuixSD" or "GUIXSD" as volume
label.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
master
Danny Milosavljevic 2017-07-10 03:23:30 +02:00
parent c9a6a36fec
commit 651de2bdb5
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/build/vm.scm
View File

@ -431,7 +431,7 @@ passing it a directory name where it is mounted."
(lambda (port) (lambda (port)
(format port (format port
"insmod part_msdos~@ "insmod part_msdos~@
search --set=root --label gnu-disk-image~@ search --set=root --label GuixSD~@
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 "gnu-disk-image") (device "GuixSD")
(title 'label) (title 'label)
(type "ext4")) (type "ext4"))

8
gnu/system/vm.scm
View File

@ -335,11 +335,17 @@ the image."
system described by OS. Said image can be copied on a USB stick as is. When system described by OS. Said image can be copied on a USB stick as is. When
VOLATILE? is true, the root file system is made volatile; this is useful VOLATILE? is true, the root file system is made volatile; this is useful
to USB sticks meant to be read-only." to USB sticks meant to be read-only."
(define normalize-label
;; ISO labels are all-caps (case-insensitive), but since
;; 'find-partition-by-label' is case-sensitive, make it all-caps here.
(if (string=? "iso9660" file-system-type)
string-upcase
identity))
(define root-label (define root-label
;; 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.)
"gnu-disk-image") (normalize-label "GuixSD"))
(define file-systems-to-keep (define file-systems-to-keep
(remove (lambda (fs) (remove (lambda (fs)