From: Danny Milosavljevic <dannym@scratchpost.org>
To: 26544@debbugs.gnu.org
Subject: bug#26544: [PATCH v3 2/9] system: Factorize operating-system-boot-parameters-file.
Date: Fri, 21 Apr 2017 14:14:35 +0200 [thread overview]
Message-ID: <20170421121442.29972-3-dannym@scratchpost.org> (raw)
In-Reply-To: <20170421121442.29972-1-dannym@scratchpost.org>
* gnu/system.scm (operating-system-boot-parameters): New variable.
(operating-system-boot-parameters-file): Modify.
---
gnu/system.scm | 64 +++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 43 insertions(+), 21 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index 44190bdfc..6601147e9 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -769,27 +769,49 @@ device in a <menu-entry>."
((label) (file-system-device fs))
(else #f)))
-(define (operating-system-boot-parameters-file os)
- "Return a file that describes the boot parameters of OS. The primary use of
-this file is the reconstruction of GRUB menu entries for old configurations."
- (mlet %store-monad ((initrd (operating-system-initrd-file os))
- (root -> (operating-system-root-file-system os))
- (store -> (operating-system-store-file-system os))
- (label -> (kernel->boot-label
- (operating-system-kernel os))))
- (gexp->file "parameters"
- #~(boot-parameters
- (version 0)
- (label #$label)
- (root-device #$(file-system-device root))
- (kernel #$(operating-system-kernel-file os))
- (kernel-arguments
- #$(operating-system-user-kernel-arguments os))
- (initrd #$initrd)
- (store
- (device #$(fs->boot-device store))
- (mount-point #$(file-system-mount-point store))))
- #:set-load-path? #f)))
+(define (operating-system-boot-parameters os system root-device)
+ "Return a monadic <boot-parameters> record that describes the boot parameters of OS.
+SYSTEM is optional. If given, adds kernel arguments for that system to <boot-parameters>."
+ (mlet* %store-monad
+ ((initrd (operating-system-initrd-file os))
+ (store -> (operating-system-store-file-system os))
+ (label -> (kernel->boot-label (operating-system-kernel os))))
+ (return (boot-parameters
+ (label label)
+ (root-device root-device)
+ (kernel (operating-system-kernel-file os))
+ (kernel-arguments
+ (operating-system-user-kernel-arguments os))
+ (initrd initrd)
+ (store-device (fs->boot-device store))
+ (store-mount-point (file-system-mount-point store))))))
+
+(define* (operating-system-boot-parameters-file os #:optional (system.drv #f))
+ "Return a file that describes the boot parameters of OS. The primary use of
+this file is the reconstruction of GRUB menu entries for old configurations.
+SYSTEM.DRV is optional. If given, adds kernel arguments for that system to the
+returned file (since the returned file is then usually stored into the
+content-addressed \"system\" directory, it's usually not a good idea
+to give it because the content hash would change by the content hash
+being stored into the \"parameters\" file)."
+ (mlet* %store-monad ((root -> (operating-system-root-file-system os))
+ (device -> (file-system-device root))
+ (params (operating-system-boot-parameters os
+ system.drv
+ device)))
+ (gexp->file "parameters"
+ #~(boot-parameters
+ (version 0)
+ (label #$(boot-parameters-label params))
+ (root-device #$(boot-parameters-root-device params))
+ (kernel #$(boot-parameters-kernel params))
+ (kernel-arguments
+ #$(boot-parameters-kernel-arguments params))
+ (initrd #$(boot-parameters-initrd params))
+ (store
+ (device #$(boot-parameters-store-device params))
+ (mount-point #$(boot-parameters-store-mount-point params))))
+ #:set-load-path? #f)))
\f
;;;
next prev parent reply other threads:[~2017-04-21 12:15 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 ` Danny Milosavljevic [this message]
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 ` bug#26544: [PATCH v4 09/10] system: grub: Use boot-parameters instead of menu-entry where possible Danny Milosavljevic
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170421121442.29972-3-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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.