From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUP1R-0001Rw-Kw for guix-patches@gnu.org; Sun, 09 Jul 2017 23:06:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUP1O-0003Rl-G1 for guix-patches@gnu.org; Sun, 09 Jul 2017 23:06:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:56741) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dUP1O-0003Rg-B0 for guix-patches@gnu.org; Sun, 09 Jul 2017 23:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dUP1O-0006QF-40 for guix-patches@gnu.org; Sun, 09 Jul 2017 23:06:02 -0400 Subject: [bug#27520] [PATCH v2] build, vm: Use "GuixSD" or "GUIXSD" as volume label. Resent-Message-ID: From: Danny Milosavljevic Date: Mon, 10 Jul 2017 05:04:40 +0200 Message-Id: <20170710030440.4282-1-dannym@scratchpost.org> In-Reply-To: <20170702120557.07355db9@scratchpost.org> References: <20170702120557.07355db9@scratchpost.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27520@debbugs.gnu.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)