me
/
guix
Archived
1
0
Fork 0
Code

system: Streamline operating-system-boot-parameters-file a bit. 

* gnu/system.scm (operating-system-boot-parameters-file)
[SYSTEM-KERNEL-ARGUMENTS?]: Remove unused argument (it had no callers) and
adjust doc, moving the self-referential tip to...
* gnu/system.scm (operating-system-boot-parameters): ... here, reworded for
clarity.

Suggested-by: Ludovic Courtès <ludo@gnu.org>
Maxim Cournoyer 2022-02-28 17:05:14 -05:00
parent 4a3b8f4d59
commit 91755fe6b2
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/system.scm
View File

@ -1454,7 +1454,10 @@ a list of <menu-entry>, to populate the \"old entries\" menu."
#:key system-kernel-arguments?) #:key system-kernel-arguments?)
"Return a monadic <boot-parameters> record that describes the boot "Return a monadic <boot-parameters> record that describes the boot
parameters of OS. When SYSTEM-KERNEL-ARGUMENTS? is true, add kernel arguments parameters of OS. When SYSTEM-KERNEL-ARGUMENTS? is true, add kernel arguments
such as '--root' and '--load' to <boot-parameters>." such as '--root' and '--load' to <boot-parameters>. The
SYSTEM-KERNEL-ARGUMENTS? should only be used in necessity, as the '--load' and
'--system' values are self-referential (they refer to the system), thus
susceptible to introduce a cyclic dependency."
(let* ((initrd (and (not (operating-system-hurd os)) (let* ((initrd (and (not (operating-system-hurd os))
(operating-system-initrd-file os))) (operating-system-initrd-file os)))
(store (operating-system-store-file-system os)) (store (operating-system-store-file-system os))
@ -1495,22 +1498,13 @@ such as '--root' and '--load' to <boot-parameters>."
(_ (_
device))) device)))
(define* (operating-system-boot-parameters-file os (define* (operating-system-boot-parameters-file os)
#:key system-kernel-arguments?) "Return a file that describes the boot parameters of OS. The primary use
"Return a file that describes the boot parameters of OS. The primary use of of this file is the reconstruction of GRUB menu entries for old
this file is the reconstruction of GRUB menu entries for old configurations. configurations."
When SYSTEM-KERNEL-ARGUMENTS? is true, add kernel arguments such as '--root'
and '--load' 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)."
(let* ((root (operating-system-root-file-system os)) (let* ((root (operating-system-root-file-system os))
(device (file-system-device root)) (device (file-system-device root))
(params (operating-system-boot-parameters (params (operating-system-boot-parameters os device)))
os device
#:system-kernel-arguments?
system-kernel-arguments?)))
(scheme-file "parameters" (scheme-file "parameters"
#~(boot-parameters #~(boot-parameters
(version #$(boot-parameters-version params)) (version #$(boot-parameters-version params))