me
/
guix
Archived
1
0
Fork 0
Code

system: Clarify that SYSTEM is either a derivation or #f. 

* gnu/system.scm (operating-system-boot-parameters):  Clarify that SYSTEM is
either a derivation or #f.
master
Danny Milosavljevic 2017-05-05 08:42:34 +02:00
parent 7e3f7acbe0
commit 360874dd1c
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/system.scm
View File

@ -766,9 +766,10 @@ device in a <menu-entry>."
((label) (file-system-device fs)) ((label) (file-system-device fs))
(else #f))) (else #f)))
(define (operating-system-boot-parameters os system root-device) (define (operating-system-boot-parameters os system.drv root-device)
"Return a monadic <boot-parameters> record that describes the boot parameters of OS. "Return a monadic <boot-parameters> record that describes the boot parameters
SYSTEM is optional. If given, adds kernel arguments for that system to <boot-parameters>." of OS. SYSTEM.DRV is either a derivation or #f. If it's a derivation, adds
kernel arguments for that derivation to <boot-parameters>."
(mlet* %store-monad (mlet* %store-monad
((initrd (operating-system-initrd-file os)) ((initrd (operating-system-initrd-file os))
(store -> (operating-system-store-file-system os)) (store -> (operating-system-store-file-system os))
@ -778,9 +779,9 @@ SYSTEM is optional. If given, adds kernel arguments for that system to <boot-pa
(root-device root-device) (root-device root-device)
(kernel (operating-system-kernel-file os)) (kernel (operating-system-kernel-file os))
(kernel-arguments (kernel-arguments
(if system (if system.drv
(operating-system-kernel-arguments os system root-device) (operating-system-kernel-arguments os system.drv root-device)
(operating-system-user-kernel-arguments os))) (operating-system-user-kernel-arguments os)))
(initrd initrd) (initrd initrd)
(store-device (fs->boot-device store)) (store-device (fs->boot-device store))
(store-mount-point (file-system-mount-point store)))))) (store-mount-point (file-system-mount-point store))))))