* gnu/system/grub(foreign-menu-entry): New record type.
menu-entry type is suitable for kernel and initrd from GuixSD as it is looking
for menu-entry-linux/bzImage for kernel in every case which makes pasing any
other form impossible.
foreign-menu-entry is very similar but is intended for entering other
distributions so it doesn't limit the name and allows kernel and initrd to be
placed in different device (in Grub syntax).
---
gnu/system/grub.scm | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index 45b46ca..9b60dc8 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -54,6 +54,9 @@
menu-entry
menu-entry?
+ foreign-menu-entry
+ foreign-menu-entry?
+
grub-configuration-file))
;;; Commentary:
@@ -116,6 +119,16 @@
(default '())) ; list of string-valued gexps
(initrd menu-entry-initrd)) ; file name of the initrd as a gexp
+(define-record-type* <foreign-menu-entry>
+ foreign-menu-entry make-foreign-menu-entry
+ foreign-menu-entry?
+ (label foreign-menu-entry-label)
+ (device foreign-menu-entry-device (default ""))
+ (linux foreign-menu-entry-linux)
+ (linux-arguments foreign-menu-entry-linux-arguments
+ (default '())) ; list of string-valued
gexps
+ (initrd foreign-menu-entry-initrd)) ; file name of the initrd
as a gexp
+
;;;
;;; Background image & themes.
@@ -264,7 +277,16 @@ corresponding to old generations of the system."
#~(string-append #$linux "/"
#$linux-image-name))
#$linux #$linux-image-name (string-join (list #$@arguments))
- #$initrd))))
+ #$initrd))
+ (($ <foreign-menu-entry> label device linux arguments initrd)
+ #~(format port "menuentry ~s {
+ linux ~a ~a
+ initrd ~a
+}~%"
+ #$label
+ (string-append #$device #$linux)
+ (string-join (list #$@arguments))
+ (string-append #$device #$initrd)))))
(mlet %store-monad ((sugar (eye-candy config store-fs system #~port)))
(define builder
--
2.9.2
