all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#27520] [PATCH] build: Use "GUIXSD" as root label.
@ 2017-06-28 21:38 Danny Milosavljevic
  2017-06-28 22:01 ` Leo Famulari
  0 siblings, 1 reply; 15+ messages in thread
From: Danny Milosavljevic @ 2017-06-28 21:38 UTC (permalink / raw)
  To: 27520

* 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)

^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2017-07-12 12:03 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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             ` [bug#27520] [PATCH v2] build, vm: Use "GuixSD" or "GUIXSD" as volume label Danny Milosavljevic
2017-07-10 10:33               ` 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

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.