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

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit 360874dd1c1aafddd82e389b9da09f69bddb2a20
Author: Danny Milosavljevic <address@hidden>
Date:   Fri May 5 08:42:34 2017 +0200

    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(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 38b9367..189a132 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))))))