From: Danny Milosavljevic <dannym@scratchpost.org>
To: 26544@debbugs.gnu.org
Subject: bug#26544: [PATCH v4 09/10] system: grub: Use boot-parameters instead of menu-entry where possible.
Date: Fri, 21 Apr 2017 14:37:13 +0200 [thread overview]
Message-ID: <20170421123714.2395-10-dannym@scratchpost.org> (raw)
In-Reply-To: <20170421123714.2395-1-dannym@scratchpost.org>
* gnu/system/grub.scm (boot-parameters->menu-entry): New variable.
(grub-configuration-file): Use boot-parameters
instead of menu-entry where possible.
* guix/scripts/system.scm (profile-boot-parameters): Update docstring.
(reinstall-grub): Use profile-boot-parameters.
(perform-action): Use profile-boot-parameters.
---
gnu/system/grub.scm | 14 ++++++++++++--
guix/scripts/system.scm | 8 ++++----
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index cde4b9e23..d2fa984ec 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -267,6 +267,16 @@ code."
(#f
#~(format #f "search --file --set ~a" #$file)))))
+(define (boot-parameters->menu-entry conf)
+ "Convert a <boot-parameters> instance to a corresponding <menu-entry>."
+ (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 +286,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 +333,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 "}~%"))
#~()))))
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 5e4e0df20..242bd8074 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -365,7 +365,7 @@ it atomically, and then run OS's activation script."
(define* (profile-boot-parameters #:optional (profile %system-profile)
(numbers (generation-numbers profile)))
- "Return a list of 'menu-entry' for the generations of PROFILE specified by
+ "Return a list of 'boot-parameters' for the generations of PROFILE specified by
NUMBERS, which is a list of generation numbers."
(define (system->boot-parameters system number time)
(unless-file-not-found
@@ -456,9 +456,9 @@ open connection to the store."
;; from the actual past values for this generation's entry.
(grub-config (grub-configuration (device root-device)))
;; Make the specified system generation the default entry.
- (entries (profile-grub-entries %system-profile (list number)))
+ (entries (profile-boot-parameters %system-profile (list number)))
(old-generations (delv number (generation-numbers %system-profile)))
- (old-entries (profile-grub-entries %system-profile old-generations))
+ (old-entries (profile-boot-parameters %system-profile old-generations))
(grub.cfg (run-with-store store
(grub-configuration-file grub-config
entries
@@ -642,7 +642,7 @@ output when building a system derivation, such as a disk image."
(operating-system-bootcfg os
(if (eq? 'init action)
'()
- (profile-grub-entries)))))
+ (profile-boot-parameters)))))
;; For 'init' and 'reconfigure', always build GRUB.CFG, even if
;; --no-grub is passed, because GRUB.CFG because we then use it as a GC
next prev parent reply other threads:[~2017-04-21 12:38 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-17 17:00 bug#26544: [PATCH] system: Move "--load" and other guix-specific parameters from the grub module to the generic system module Danny Milosavljevic
2017-04-17 17:26 ` Mathieu Othacehe
2017-04-18 8:30 ` Ludovic Courtès
2017-04-18 14:51 ` Danny Milosavljevic
2017-04-19 9:59 ` Ludovic Courtès
2017-04-21 2:21 ` bug#26544: [PATCH v2 0/8] " Danny Milosavljevic
2017-04-21 2:21 ` bug#26544: [PATCH v2 1/8] system: Rename operating-system-kernel-arguments to operating-system-user-kernel-arguments Danny Milosavljevic
2017-04-21 8:23 ` Mathieu Othacehe
2017-04-22 18:56 ` Danny Milosavljevic
2017-04-21 2:21 ` bug#26544: [PATCH v2 2/8] system: Rename operating-system-parameters-file to operating-system-boot-parameters-file Danny Milosavljevic
2017-04-21 8:23 ` Mathieu Othacehe
2017-04-22 18:57 ` Danny Milosavljevic
2017-04-21 2:21 ` bug#26544: [PATCH v2 3/8] system: Factorize operating-system-boot-parameters-file Danny Milosavljevic
2017-04-21 8:24 ` Mathieu Othacehe
2017-04-21 2:21 ` bug#26544: [PATCH v2 4/8] system: Introduce operating-system-kernel-arguments and use it Danny Milosavljevic
2017-04-21 8:53 ` Mathieu Othacehe
2017-04-21 2:21 ` bug#26544: [PATCH v2 5/8] system: Introduce read-boot-parameters-file Danny Milosavljevic
2017-04-21 8:59 ` Mathieu Othacehe
2017-04-21 2:21 ` bug#26544: [PATCH v2 6/8] system: vm: Use operating-system-kernel-arguments Danny Milosavljevic
2017-04-21 9:02 ` Mathieu Othacehe
2017-04-21 2:21 ` bug#26544: [PATCH v2 7/8] system: Use operating-system-boot-parameters directly Danny Milosavljevic
2017-04-21 9:02 ` Mathieu Othacehe
2017-04-21 2:21 ` bug#26544: [PATCH v2 8/8] system: grub: Use boot-parameters instead of menu-entry where possible Danny Milosavljevic
2017-04-21 9:01 ` Mathieu Othacehe
2017-04-21 8:22 ` bug#26544: [PATCH v2 0/8] system: Move "--load" and other guix-specific parameters from the grub module to the generic system module Mathieu Othacehe
2017-04-21 12:14 ` bug#26544: [PATCH v3 0/9] " Danny Milosavljevic
2017-04-21 12:14 ` bug#26544: [PATCH v3 1/9] system: Rename operating-system-parameters-file to operating-system-boot-parameters-file Danny Milosavljevic
2017-04-21 12:14 ` bug#26544: [PATCH v3 2/9] system: Factorize operating-system-boot-parameters-file Danny Milosavljevic
2017-04-21 12:14 ` bug#26544: [PATCH v3 3/9] system: Introduce operating-system-kernel-arguments and use it Danny Milosavljevic
2017-04-21 12:14 ` bug#26544: [PATCH v3 4/9] system: Introduce read-boot-parameters-file Danny Milosavljevic
2017-04-21 12:14 ` bug#26544: [PATCH v3 5/9] scripts: Make boot-parameters label include generation number and time Danny Milosavljevic
2017-04-21 12:14 ` bug#26544: [PATCH v3 6/9] system: vm: Use operating-system-kernel-arguments Danny Milosavljevic
2017-04-21 12:14 ` bug#26544: [PATCH v3 7/9] system: Use operating-system-boot-parameters directly Danny Milosavljevic
2017-04-21 12:14 ` bug#26544: [PATCH v3 8/9] system: grub: Use boot-parameters instead of menu-entry where possible Danny Milosavljevic
2017-04-21 12:14 ` bug#26544: [PATCH v3 9/9] scripts: Remove profile-grub-entries Danny Milosavljevic
2017-04-21 12:37 ` bug#26544: [PATCH v4 00/10] system: Move "--load" and other guix-specific parameters from the grub module to the generic system module Danny Milosavljevic
2017-04-21 12:37 ` bug#26544: [PATCH v4 01/10] system: Rename operating-system-kernel-arguments to operating-system-user-kernel-arguments Danny Milosavljevic
2017-04-22 18:59 ` Danny Milosavljevic
2017-04-21 12:37 ` bug#26544: [PATCH v4 02/10] system: Rename operating-system-parameters-file to operating-system-boot-parameters-file Danny Milosavljevic
2017-04-22 19:00 ` Danny Milosavljevic
2017-04-21 12:37 ` bug#26544: [PATCH v4 03/10] system: Factorize operating-system-boot-parameters-file Danny Milosavljevic
2017-04-22 20:08 ` Danny Milosavljevic
2017-04-21 12:37 ` bug#26544: [PATCH v4 04/10] system: Introduce operating-system-kernel-arguments and use it Danny Milosavljevic
2017-04-21 12:37 ` bug#26544: [PATCH v4 05/10] system: Introduce read-boot-parameters-file Danny Milosavljevic
2017-04-21 12:37 ` bug#26544: [PATCH v4 06/10] scripts: Make boot-parameters label include generation number and time Danny Milosavljevic
2017-04-22 20:32 ` Danny Milosavljevic
2017-04-21 12:37 ` bug#26544: [PATCH v4 07/10] system: vm: Use operating-system-kernel-arguments Danny Milosavljevic
2017-04-21 12:37 ` bug#26544: [PATCH v4 08/10] system: Use operating-system-boot-parameters directly Danny Milosavljevic
2017-04-21 12:37 ` Danny Milosavljevic [this message]
2017-04-21 12:37 ` bug#26544: [PATCH v4 10/10] scripts: Remove profile-grub-entries Danny Milosavljevic
2017-04-21 13:04 ` Mathieu Othacehe
2017-04-21 15:20 ` Danny Milosavljevic
2017-04-21 16:11 ` Mathieu Othacehe
2017-04-22 19:05 ` bug#26544: [PATCH v4 00/10] system: Move "--load" and other guix-specific parameters from the grub module to the generic system module Danny Milosavljevic
2017-05-05 7:04 ` Danny Milosavljevic
2017-05-05 8:03 ` Ludovic Courtès
2017-05-05 13:35 ` bug#26544: Merged to master: [PATCH v4 *] " Danny Milosavljevic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170421123714.2395-10-dannym@scratchpost.org \
--to=dannym@scratchpost.org \
--cc=26544@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).