summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-04-06 16:19:05 +0200
committerLudovic Courtès <ludo@gnu.org>2020-04-11 20:48:12 +0200
commit683cba75ea529c7390a79826124d7798d47d65cd (patch)
treef1e357f54e526d21fa6882e55039fa7aab1abe2d
parent6a488a3504b345b193e24dfdba2a2ac6b1db1234 (diff)
downloadguix-683cba75ea529c7390a79826124d7798d47d65cd.tar.gz
linux-boot: 'make-essential-device-nodes' root parameter is optional.
* gnu/build/linux-boot.scm (make-essential-device-nodes): Change 'root'
to an optional parameter.
* gnu/build/vm.scm (root-partition-initializer): Adjust accordingly.
-rw-r--r--gnu/build/linux-boot.scm4
-rw-r--r--gnu/build/vm.scm2
2 files changed, 3 insertions, 3 deletions
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index 4fb711b8f2..787665e320 100644
--- a/gnu/build/linux-boot.scm
+++ b/gnu/build/linux-boot.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
 ;;;
@@ -223,7 +223,7 @@ one specific hardware device. These we have to create."
               (call-with-input-file devname-name
                                     read-static-device-nodes))))
 
-(define* (make-essential-device-nodes #:key (root "/"))
+(define* (make-essential-device-nodes #:optional (root "/"))
   "Make essential device nodes under ROOT/dev."
   ;; The hand-made devtmpfs/udev!
 
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 84bb2592e2..c062ab5c71 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -392,7 +392,7 @@ system that is passed to 'populate-root-file-system'."
                       target))
 
     ;; Populate /dev.
-    (make-essential-device-nodes #:root target)
+    (make-essential-device-nodes target)
 
     ;; Optionally, register the inputs in the image's store.
     (when register-closures?