[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: system: Adjust 'grub.cfg' to work on systems with a separate /boo
From: |
Ludovic Courtès |
Subject: |
02/04: system: Adjust 'grub.cfg' to work on systems with a separate /boot. |
Date: |
Sat, 13 Dec 2014 21:31:46 +0000 |
civodul pushed a commit to branch master
in repository guix.
commit 6c777cf88c84c164e825f6e875bb4d2812892ed9
Author: Ludovic Courtès <address@hidden>
Date: Sat Dec 13 21:28:12 2014 +0100
system: Adjust 'grub.cfg' to work on systems with a separate /boot.
Fixes <http://bugs.gnu.org/19220>.
Reported by Nikita Karetnikov <address@hidden>.
* gnu/system/grub.scm (grub-configuration-file)[entry->gexp]: Add
'search --file --set'.
(grub-configuration-file)[builder]: Remove 'search.file'.
---
gnu/system/grub.scm | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index 00e09f9..76fde20 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -209,11 +209,14 @@ entries corresponding to old generations of the system."
(match-lambda
(($ <menu-entry> label linux arguments initrd)
#~(format port "menuentry ~s {
+ # Set 'root' to the partition that contains the kernel.
+ search --file --set ~a/bzImage~%
+
linux ~a/bzImage ~a
initrd ~a
}~%"
#$label
- #$linux (string-join (list address@hidden))
+ #$linux #$linux (string-join (list address@hidden))
#$initrd))))
(mlet %store-monad ((sugar (eye-candy config #~port)))
@@ -223,14 +226,9 @@ entries corresponding to old generations of the system."
#$sugar
(format port "
set default=~a
-set timeout=~a
-search.file ~a/bzImage~%"
+set timeout=~a~%"
#$(grub-configuration-default-entry config)
- #$(grub-configuration-timeout config)
- #$(any (match-lambda
- (($ <menu-entry> _ linux)
- linux))
- all-entries))
+ #$(grub-configuration-timeout config))
#$@(map entry->gexp all-entries)
#$@(if (pair? old-entries)