guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

25/62: linux-boot: 'make-essential-device-nodes' root parameter is optio


From: guix-commits
Subject: 25/62: linux-boot: 'make-essential-device-nodes' root parameter is optional.
Date: Sat, 11 Apr 2020 11:35:49 -0400 (EDT)

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit 71f84d166f2d2bb498c4cc31c7c7471762b8c985
Author: Ludovic Courtès <address@hidden>
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 
<address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
 ;;; Copyright © 2019 Guillaume Le Vaillant <address@hidden>
 ;;;
@@ -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 84bb259..c062ab5 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?



reply via email to

[Prev in Thread] Current Thread [Next in Thread]