summaryrefslogtreecommitdiff
path: root/gnu/system.scm
diff options
context:
space:
mode:
authorCarlos Sánchez de La Lama <csanchezdll@gmail.com>2016-09-14 16:13:24 +0200
committerLudovic Courtès <ludo@gnu.org>2016-09-24 17:48:13 +0900
commit0f65f54ebd76324653fd5506a7dab42ee44d9255 (patch)
tree278735904428790cf55c52ae657acb4f7e5ed743 /gnu/system.scm
parentd7b342d81556ddee9e369f78255bc76367a004ae (diff)
downloadpatches-0f65f54ebd76324653fd5506a7dab42ee44d9255.tar
patches-0f65f54ebd76324653fd5506a7dab42ee44d9255.tar.gz
system: grub.cfg uses correct file names when store is not in root partition.
Fixes <http://bugs.gnu.org/24346>. Reported by csanchezdll@gmail.com (Carlos Sánchez de La Lama). * guix/scripts/system.scm (previous-grub-entries): Get the initrd file name from PARAMS. * gnu/system.scm (operating-system-grub.cfg): Use 'operating-system-initrd-file' to retrieve the initrd file name. * gnu/system/grub.scm (strip-mount-point): New procedure. (grub-configuration-file)[entry->gexp]: Call 'strip-mount-point' for LINUX and INITRD. Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/system.scm')
-rw-r--r--gnu/system.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index bf79bf1c27..38ae8f1771 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -727,6 +727,7 @@ listed in OS. The C library expects to find it under
(store-fs -> (operating-system-store-file-system os))
(label -> (kernel->grub-label (operating-system-kernel os)))
(kernel -> (operating-system-kernel-file os))
+ (initrd (operating-system-initrd-file os))
(root-device -> (if (eq? 'uuid (file-system-title root-fs))
(uuid->string (file-system-device root-fs))
(file-system-device root-fs)))
@@ -739,7 +740,7 @@ listed in OS. The C library expects to find it under
#~(string-append "--load=" #$system
"/boot")
(operating-system-kernel-arguments os)))
- (initrd (file-append system "/initrd"))))))
+ (initrd initrd)))))
(grub-configuration-file (operating-system-bootloader os)
store-fs entries
#:old-entries old-entries)))