aboutsummaryrefslogtreecommitdiff
path: root/gnu/system.scm
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2017-05-05 08:42:34 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2017-05-05 15:03:48 +0200
commit360874dd1c1aafddd82e389b9da09f69bddb2a20 (patch)
treedcaecb33d6cdb53688133d950cc206a7f8a2f296 /gnu/system.scm
parent7e3f7acbe0885fd8a6e509fd0c309d1f4d9d3097 (diff)
downloadguix-360874dd1c1aafddd82e389b9da09f69bddb2a20.tar
guix-360874dd1c1aafddd82e389b9da09f69bddb2a20.tar.gz
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.
Diffstat (limited to 'gnu/system.scm')
-rw-r--r--gnu/system.scm13
1 files changed, 7 insertions, 6 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 38b936787f..189a13262f 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -766,9 +766,10 @@ device in a <menu-entry>."
((label) (file-system-device fs))
(else #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>."
+(define (operating-system-boot-parameters os system.drv root-device)
+ "Return a monadic <boot-parameters> record that describes the 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
((initrd (operating-system-initrd-file 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)
(kernel (operating-system-kernel-file os))
(kernel-arguments
- (if system
- (operating-system-kernel-arguments os system root-device)
- (operating-system-user-kernel-arguments os)))
+ (if system.drv
+ (operating-system-kernel-arguments os system.drv root-device)
+ (operating-system-user-kernel-arguments os)))
(initrd initrd)
(store-device (fs->boot-device store))
(store-mount-point (file-system-mount-point store))))))