diff options
author | Ludovic Courtès <ludo@gnu.org> | 2022-06-08 14:53:16 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-06-08 14:53:16 +0200 |
commit | 091eb323ba2787ce64a1fb2796e7e06dbee6037c (patch) | |
tree | 446a869245541bd48f303caef76e4c24f6e7d0bb /gnu/system.scm | |
parent | 05fef7bfc60058763f5a64ec0feaf3876b56281d (diff) | |
parent | 0c5299200ffcd16370f047b7ccb187c60f30da34 (diff) | |
download | guix-patches-091eb323ba2787ce64a1fb2796e7e06dbee6037c.tar guix-patches-091eb323ba2787ce64a1fb2796e7e06dbee6037c.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system.scm')
-rw-r--r-- | gnu/system.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/system.scm b/gnu/system.scm index ba3a1865d7..2c81478d00 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -300,7 +300,7 @@ VERSION is the target version of the boot-parameters record." (define* (operating-system-kernel-arguments os root-device #:key (version %boot-parameters-version)) "Return all the kernel arguments, including the ones not specified directly -by the user. VERSION should match that of the target <boot-parameter> record +by the user. VERSION should match that of the target <boot-parameters> record object that will contain the kernel parameters." (append (bootable-kernel-arguments os root-device version) (operating-system-user-kernel-arguments os))) @@ -515,6 +515,7 @@ The object has its kernel-arguments extended in order to make it bootable." (boot-parameters-kernel-arguments params)))))) (define (boot-parameters->menu-entry conf) + "Return a <menu-entry> instance given CONF, a <boot-parameters> instance." (let* ((kernel (boot-parameters-kernel conf)) (multiboot-modules (boot-parameters-multiboot-modules conf)) (multiboot? (pair? multiboot-modules))) |