aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2017-07-10 03:23:30 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2017-07-10 15:35:43 +0200
commit651de2bdb5fd451c50933dcf8d647d470d826261 (patch)
tree3a3d72378dbb3c744e7b2b17c363b743549eee34 /gnu
parentc9a6a36fec5b17948408c667f9779c9c8670f015 (diff)
downloadguix-651de2bdb5fd451c50933dcf8d647d470d826261.tar
guix-651de2bdb5fd451c50933dcf8d647d470d826261.tar.gz
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>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/build/vm.scm2
-rw-r--r--gnu/system/install.scm2
-rw-r--r--gnu/system/vm.scm8
3 files changed, 9 insertions, 3 deletions
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index e631e5a834..2d41c5756b 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -431,7 +431,7 @@ passing it a directory name where it is mounted."
(lambda (port)
(format port
"insmod part_msdos~@
- search --set=root --label gnu-disk-image~@
+ search --set=root --label GuixSD~@
configfile /boot/grub/grub.cfg~%")))
(display "creating EFI firmware image...")
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index d5d11371a3..f9aa7f6733 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -306,7 +306,7 @@ Use Alt-F2 for documentation.
;; the appropriate one.
(cons* (file-system
(mount-point "/")
- (device "gnu-disk-image")
+ (device "GuixSD")
(title 'label)
(type "ext4"))
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 3e722d0815..66a2448ceb 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -335,11 +335,17 @@ the image."
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
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
;; 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
;; be even better, but somewhat less convenient.)
- "gnu-disk-image")
+ (normalize-label "GuixSD"))
(define file-systems-to-keep
(remove (lambda (fs)