[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#26339: [PATCH v2 01/12] system: Pass <bootloader-parameter> to grub.
From: |
Mathieu Othacehe |
Subject: |
bug#26339: [PATCH v2 01/12] system: Pass <bootloader-parameter> to grub. |
Date: |
Mon, 17 Apr 2017 11:01:37 +0200 |
* gnu/system.scm (operating-system-grub.cfg): Pass <bootloader-parameter>.
* gnu/system/grub.scm (boot-parameters->menu-entry): New variable.
(grub-configuration-file): Use boot-parameters->menu-entry.
---
gnu/system.scm | 11 ++++++-----
gnu/system/grub.scm | 13 +++++++++++--
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index 89c4150f9..7c66f6088 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -742,16 +742,17 @@ populate the \"old entries\" menu."
(root-device -> (if (eq? 'uuid (file-system-title root-fs))
(uuid->string (file-system-device root-fs))
(file-system-device root-fs)))
- (entries -> (list (menu-entry
+ (entries -> (list (boot-parameters
(label label)
+ (root-device root-device)
;; The device where the kernel and initrd live.
- (device (fs->boot-device store-fs))
- (device-mount-point
+ (store-device (fs->boot-device store-fs))
+ (store-mount-point
(file-system-mount-point store-fs))
- (linux kernel)
- (linux-arguments
+ (kernel kernel)
+ (kernel-arguments
(cons* (string-append "--root=" root-device)
#~(string-append "--system=" #$system)
#~(string-append "--load=" #$system
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index cde4b9e23..f2838d633 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -267,6 +267,15 @@ code."
(#f
#~(format #f "search --file --set ~a" #$file)))))
+(define (boot-parameters->menu-entry conf)
+ (menu-entry
+ (label (boot-parameters-label conf))
+ (device (boot-parameters-store-device conf))
+ (device-mount-point (boot-parameters-store-mount-point conf))
+ (linux (boot-parameters-kernel conf))
+ (linux-arguments (boot-parameters-kernel-arguments conf))
+ (initrd (boot-parameters-initrd conf))))
+
(define* (grub-configuration-file config entries
#:key
(system (%current-system))
@@ -276,7 +285,7 @@ code."
<file-system> object. OLD-ENTRIES is taken to be a list of menu entries
corresponding to old generations of the system."
(define all-entries
- (append entries
+ (append (map boot-parameters->menu-entry entries)
(grub-configuration-menu-entries config)))
(define entry->gexp
@@ -323,7 +332,7 @@ set timeout=~a~%"
#$@(if (pair? old-entries)
#~((format port "
submenu \"GNU system, old configurations...\" {~%")
- #$@(map entry->gexp old-entries)
+ #$@(map entry->gexp (map boot-parameters->menu-entry
old-entries))
(format port "}~%"))
#~()))))
--
2.12.2
- bug#26339: bootloader and kernel arguments "--root", "--system", "--load", (continued)
- bug#26339: bootloader and kernel arguments "--root", "--system", "--load", Danny Milosavljevic, 2017/04/15
- bug#26339: problem with commit abae042, Leo Famulari, 2017/04/15
- bug#26339: problem with commit abae042, Danny Milosavljevic, 2017/04/15
- bug#26339: problem with commit abae042, Leo Famulari, 2017/04/15
bug#26339: [PATCH 01/18] system: Pass <bootloader-parameter> to grub., David Craven, 2017/04/03
bug#26339: [PATCH 01/18] system: Pass <bootloader-parameter> to grub., Danny Milosavljevic, 2017/04/15
bug#26339: [PATCH 01/18] system: Pass <bootloader-parameter> to grub., Danny Milosavljevic, 2017/04/15
bug#26339: [PATCH 01/18] system: Pass <bootloader-parameter> to grub., Danny Milosavljevic, 2017/04/15
bug#26339: [PATCH v2 00/12] Support for non grub bootloaders., Mathieu Othacehe, 2017/04/17
- bug#26339: [PATCH v2 01/12] system: Pass <bootloader-parameter> to grub.,
Mathieu Othacehe <=
- bug#26339: [PATCH v2 03/12] scripts: system: Rename --no-grub option to --no-bootloader., Mathieu Othacehe, 2017/04/17
- bug#26339: [PATCH v2 05/12] system: Add bootloader type., Mathieu Othacehe, 2017/04/17
- bug#26339: [PATCH v2 04/12] bootloader: Add install procedures and use them., Mathieu Othacehe, 2017/04/17
- bug#26339: [PATCH v2 02/12] system: Add extlinux support., Mathieu Othacehe, 2017/04/17
- bug#26339: [PATCH v2 07/12] bootloader: Add device and type to bootloader-configuration record., Mathieu Othacehe, 2017/04/17
- bug#26339: [PATCH v2 06/12] bootloader: Stop using grub module., Mathieu Othacehe, 2017/04/17
- bug#26339: [PATCH v2 09/12] scripts: system: Adapt "reconfigure" to new bootloader API., Mathieu Othacehe, 2017/04/17
- bug#26339: [PATCH v2 08/12] scripts: system: Remove unused variables., Mathieu Othacehe, 2017/04/17