From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Geerinckx-Rice Subject: bug#27735: [PATCH 1/2] build, vm: Use a slightly less generic label. Date: Mon, 17 Jul 2017 16:51:51 +0200 Message-ID: <20170717145151.12222-1-me@tobias.gr> References: <327af9f3-fdfb-7916-f0ea-9aec0fae20f3@tobias.gr> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dX7MY-0007sF-Rt for bug-guix@gnu.org; Mon, 17 Jul 2017 10:51:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dX7MU-0003A0-VL for bug-guix@gnu.org; Mon, 17 Jul 2017 10:51:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:41903) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dX7MU-00039u-RC for bug-guix@gnu.org; Mon, 17 Jul 2017 10:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dX7MU-0008Cq-K9 for bug-guix@gnu.org; Mon, 17 Jul 2017 10:51:02 -0400 In-Reply-To: <327af9f3-fdfb-7916-f0ea-9aec0fae20f3@tobias.gr> Sender: "Debbugs-submit" Resent-Message-ID: List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: 27735@debbugs.gnu.org * gnu/build/vm.scm (initialize-hard-disk): Use "GuixSD-image" as label. * gnu/system/install.scm (installation-os): Likewise. * gnu/system/vm.scm (system-disk-image): Likewise. --- Or GuixSD-bikeshed or whatever. gnu/build/vm.scm | 7 +++++-- gnu/system/install.scm | 2 +- gnu/system/vm.scm | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index d8c53ef37..e71b1b92e 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -354,7 +354,7 @@ SYSTEM-DIRECTORY is the name of the directory of the 'system' derivation." (error "failed to create GRUB EFI image")))) (define* (make-iso9660-image grub config-file os-drv target - #:key (volume-id "GuixSD") (volume-uuid #f)) + #:key (volume-id "GuixSD-image") (volume-uuid #f)) "Given a GRUB package, creates an iso image as TARGET, using CONFIG-FILE as Grub configuration and OS-DRV as the stuff in it." (let ((grub-mkrescue (string-append grub "/bin/grub-mkrescue"))) @@ -440,11 +440,14 @@ passing it a directory name where it is mounted." ;; Create a tiny configuration file telling the embedded grub ;; where to load the real thing. + ;; XXX This is quite fragile, and can leave the system in an unusable + ;; state when there's more than one volume with this label present. + ;; Reproducible (not-)UUIDs could reduce the risk but not eliminate it. (call-with-output-file grub-config (lambda (port) (format port "insmod part_msdos~@ - search --set=root --label GuixSD~@ + search --set=root --label GuixSD-image~@ configfile /boot/grub/grub.cfg~%"))) (display "creating EFI firmware image...") diff --git a/gnu/system/install.scm b/gnu/system/install.scm index f9aa7f673..866440eb4 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 "GuixSD") + (device "GuixSD-image") (title 'label) (type "ext4")) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index dd9be2c6f..6e06781d5 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -345,7 +345,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.) - (normalize-label "GuixSD")) + (normalize-label "GuixSD-image")) (define file-systems-to-keep (remove (lambda (fs) -- 2.13.1