civodul pushed a commit to branch wip-hurd-vm
in repository guix.
commit eef7e0fe197e3c10b18d8316889cef22851c358c
Author: Ludovic Courtès <[email protected]>
AuthorDate: Mon Apr 6 16:19:05 2020 +0200
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.
---
gnu/build/linux-boot.scm | 4 ++--
gnu/build/vm.scm | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/build/linux-boot.scm b/gnu/build/linux-boot.scm
index 4fb711b..787665e 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
<[email protected]>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès
<[email protected]>
;;; Copyright © 2017 Mathieu Othacehe <[email protected]>
;;; Copyright © 2019 Guillaume Le Vaillant <[email protected]>
;;;
@@ -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 d4ded62..1c62492 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -391,7 +391,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?