From 360874dd1c1aafddd82e389b9da09f69bddb2a20 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 5 May 2017 08:42:34 +0200 Subject: 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. --- gnu/system.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') 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 @@ (define (fs->boot-device fs) ((label) (file-system-device fs)) (else #f))) -(define (operating-system-boot-parameters os system root-device) - "Return a monadic record that describes the boot parameters of OS. -SYSTEM is optional. If given, adds kernel arguments for that system to ." +(define (operating-system-boot-parameters os system.drv root-device) + "Return a monadic 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 ." (mlet* %store-monad ((initrd (operating-system-initrd-file os)) (store -> (operating-system-store-file-system os)) @@ -778,9 +779,9 @@ (define (operating-system-boot-parameters os system root-device) (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)))))) -- cgit v1.2.3