[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#26544: [PATCH v3 2/9] system: Factorize operating-system-boot-parame
From: |
Danny Milosavljevic |
Subject: |
bug#26544: [PATCH v3 2/9] system: Factorize operating-system-boot-parameters-file. |
Date: |
Fri, 21 Apr 2017 14:14:35 +0200 |
* 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)))
;;;
- bug#26544: [PATCH v2 7/8] system: Use operating-system-boot-parameters directly., (continued)
- bug#26544: [PATCH v2 7/8] system: Use operating-system-boot-parameters directly., Danny Milosavljevic, 2017/04/20
- bug#26544: [PATCH v2 3/8] system: Factorize operating-system-boot-parameters-file., Danny Milosavljevic, 2017/04/20
- bug#26544: [PATCH v2 5/8] system: Introduce read-boot-parameters-file., Danny Milosavljevic, 2017/04/20
- bug#26544: [PATCH v2 8/8] system: grub: Use boot-parameters instead of menu-entry where possible., Danny Milosavljevic, 2017/04/20
- 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
- bug#26544: [PATCH v3 0/9] system: Move "--load" and other guix-specific parameters from the grub module to the generic system module., Danny Milosavljevic, 2017/04/21
- bug#26544: [PATCH v3 2/9] system: Factorize operating-system-boot-parameters-file.,
Danny Milosavljevic <=
- bug#26544: [PATCH v3 3/9] system: Introduce operating-system-kernel-arguments and use it., Danny Milosavljevic, 2017/04/21
- bug#26544: [PATCH v3 1/9] system: Rename operating-system-parameters-file to operating-system-boot-parameters-file., Danny Milosavljevic, 2017/04/21
- bug#26544: [PATCH v3 4/9] system: Introduce read-boot-parameters-file., Danny Milosavljevic, 2017/04/21
- bug#26544: [PATCH v3 8/9] system: grub: Use boot-parameters instead of menu-entry where possible., Danny Milosavljevic, 2017/04/21
- bug#26544: [PATCH v3 7/9] system: Use operating-system-boot-parameters directly., Danny Milosavljevic, 2017/04/21
- bug#26544: [PATCH v3 6/9] system: vm: Use operating-system-kernel-arguments., Danny Milosavljevic, 2017/04/21
- bug#26544: [PATCH v3 5/9] scripts: Make boot-parameters label include generation number and time., Danny Milosavljevic, 2017/04/21
- bug#26544: [PATCH v3 9/9] scripts: Remove profile-grub-entries., Danny Milosavljevic, 2017/04/21
- 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
- bug#26544: [PATCH v4 03/10] system: Factorize operating-system-boot-parameters-file., Danny Milosavljevic, 2017/04/21