From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQKfx-0002Zv-Kv for guix-patches@gnu.org; Wed, 28 Jun 2017 17:39:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQKfu-0005mT-GQ for guix-patches@gnu.org; Wed, 28 Jun 2017 17:39:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:40358) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQKfu-0005mJ-Cb for guix-patches@gnu.org; Wed, 28 Jun 2017 17:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dQKfu-0006Ue-4E for guix-patches@gnu.org; Wed, 28 Jun 2017 17:39:02 -0400 Subject: [bug#27520] [PATCH] build: Use "GUIXSD" as root label. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:54464) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQKfi-0002X4-VJ for guix-patches@gnu.org; Wed, 28 Jun 2017 17:38:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQKff-0005aX-Rs for guix-patches@gnu.org; Wed, 28 Jun 2017 17:38:50 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:50944) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dQKff-0005Ys-KI for guix-patches@gnu.org; Wed, 28 Jun 2017 17:38:47 -0400 From: Danny Milosavljevic Date: Wed, 28 Jun 2017 23:38:41 +0200 Message-Id: <20170628213841.28774-1-dannym@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): Make grub search for label "GUIXSD". * gnu/system/install.scm (installation-os): Set filesystem root label to "GUIXSD". * gnu/system/vm.scm (system-disk-image): Set filesystem root label to "GUIXSD". --- gnu/build/vm.scm | 2 +- gnu/system/install.scm | 2 +- gnu/system/vm.scm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 57619764c..6b91e767f 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -398,7 +398,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 0a78d030d..24c736304 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -300,7 +300,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 392737d07..6fae999ef 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -282,7 +282,7 @@ to USB sticks meant to be read-only." ;; 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") + "GUIXSD") (define file-systems-to-keep (remove (lambda (fs)