From: Danny Milosavljevic <dannym@scratchpost.org>
To: 27520@debbugs.gnu.org
Subject: [bug#27520] [PATCH v2] build, vm: Use "GuixSD" or "GUIXSD" as volume label.
Date: Mon, 10 Jul 2017 05:04:40 +0200 [thread overview]
Message-ID: <20170710030440.4282-1-dannym@scratchpost.org> (raw)
In-Reply-To: <20170702120557.07355db9@scratchpost.org>
* 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.
---
gnu/build/vm.scm | 2 +-
gnu/system/install.scm | 2 +-
gnu/system/vm.scm | 8 +++++++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index e631e5a83..2d41c5756 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 d5d11371a..f9aa7f673 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 3e722d081..66a2448ce 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)
next prev parent reply other threads:[~2017-07-10 3:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-28 21:38 [bug#27520] [PATCH] build: Use "GUIXSD" as root label Danny Milosavljevic
2017-06-28 22:01 ` Leo Famulari
2017-06-28 22:17 ` Danny Milosavljevic
2017-06-28 22:47 ` Leo Famulari
2017-06-28 23:54 ` Danny Milosavljevic
2017-06-29 16:18 ` Ludovic Courtès
2017-07-02 10:05 ` Danny Milosavljevic
2017-07-02 17:25 ` [bug#27520] Booting by UUID - UUID types and bootloader Danny Milosavljevic
2017-07-02 19:49 ` Ludovic Courtès
2017-07-10 3:04 ` Danny Milosavljevic [this message]
2017-07-10 10:33 ` [bug#27520] [PATCH v2] build, vm: Use "GuixSD" or "GUIXSD" as volume label Ludovic Courtès
2017-07-10 13:37 ` bug#27520: " Danny Milosavljevic
2017-07-11 15:30 ` [bug#27520] " Ludovic Courtès
2017-07-11 16:00 ` Danny Milosavljevic
2017-07-12 12:02 ` [bug#27520] System test failures Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170710030440.4282-1-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=27520@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.