From: Tobias Geerinckx-Rice <me@tobias.gr>
To: 27735@debbugs.gnu.org
Subject: bug#27735: [PATCH 1/2] build, vm: Use a slightly less generic label.
Date: Mon, 17 Jul 2017 16:51:51 +0200 [thread overview]
Message-ID: <20170717145151.12222-1-me@tobias.gr> (raw)
In-Reply-To: <327af9f3-fdfb-7916-f0ea-9aec0fae20f3@tobias.gr>
* 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
next prev parent reply other threads:[~2017-07-17 14:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-17 14:40 bug#27735: Unbootable images with GuixSD on... "GuixSD" Tobias Geerinckx-Rice
2017-07-17 14:51 ` Tobias Geerinckx-Rice [this message]
2017-07-17 17:20 ` bug#27735: [PATCH 1/2] build, vm: Use a slightly less generic label Danny Milosavljevic
2017-07-17 17:58 ` Tobias Geerinckx-Rice
2017-07-18 10:09 ` Ludovic Courtès
2017-07-18 12:30 ` Tobias Geerinckx-Rice
2017-07-18 13:48 ` Danny Milosavljevic
2017-07-17 17:17 ` bug#27735: Unbootable images with GuixSD on... "GuixSD" Danny Milosavljevic
2017-07-17 18:12 ` Tobias Geerinckx-Rice
2017-07-17 18:37 ` Tobias Geerinckx-Rice
2017-07-18 11:49 ` Ludovic Courtès
2017-07-18 15:09 ` Tobias Geerinckx-Rice
2017-07-18 18:59 ` Ludovic Courtès
2017-07-18 20:42 ` Tobias Geerinckx-Rice
2017-07-19 19:11 ` Danny Milosavljevic
2017-07-19 22:32 ` bug#27735: Lookup by UUID Ludovic Courtès
2017-07-20 17:38 ` Danny Milosavljevic
2017-07-20 20:32 ` Ludovic Courtès
2017-07-20 21:51 ` Danny Milosavljevic
2017-08-05 17:50 ` Danny Milosavljevic
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170717145151.12222-1-me@tobias.gr \
--to=me@tobias.gr \
--cc=27735@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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).