diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-04-07 10:21:48 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-04-11 20:59:40 +0200 |
| commit | cd45d656f1e8746fadacfbffd5740d22228c4c21 (patch) | |
| tree | c323d2a27e755034469b39c1ab1d8a0a34942a0d | |
| parent | ac61e876a4594af763994f0d5d4681ee5284f1f0 (diff) | |
vm: Make the device node procedure a parameter.
* gnu/build/vm.scm (root-partition-initializer): Add #:make-device-nodes
parameter and use it.
* gnu/system/vm.scm (qemu-image): Add #:device-node parameter. Pass
#:make-device-nodes to 'root-partition-initializer'.
| -rw-r--r-- | gnu/build/vm.scm | 4 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index c062ab5c71..d2bf7418fd 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -371,6 +371,8 @@ it, run its initializer, and unmount it." (register-closures? #t) system-directory (deduplicate? #t) + (make-device-nodes + make-essential-device-nodes) (extra-directives '())) "Return a procedure to initialize a root partition. @@ -392,7 +394,7 @@ system that is passed to 'populate-root-file-system'." target)) ;; Populate /dev. - (make-essential-device-nodes target) + (make-device-nodes target) ;; Optionally, register the inputs in the image's store. (when register-closures? diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 65e96d42ee..e8c2f6e162 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -369,6 +369,7 @@ INPUTS is a list of inputs (as for packages)." (disk-image-format "qcow2") (file-system-type "ext4") (file-system-options '()) + (device-nodes 'linux) (extra-directives '()) file-system-label file-system-uuid @@ -397,6 +398,9 @@ the image. By default, REGISTER-CLOSURES? is set to true only if a service of type GUIX-SERVICE-TYPE is present in the services definition of the operating system. +When DEVICE-NODES is 'linux, create Linux-device block and character devices +under /dev. When it is 'hurd, do Hurdish things. + EXTRA-DIRECTIVES is an optional list of directives to populate the root file system that is passed to 'populate-root-file-system'." (define schema @@ -416,6 +420,9 @@ system that is passed to 'populate-root-file-system'." #~(begin (use-modules (gnu build bootloader) (gnu build vm) + ((gnu build linux-boot) + #:select (make-essential-device-nodes + make-hurd-device-nodes)) (guix store database) (guix build utils) (srfi srfi-26) @@ -453,6 +460,11 @@ system that is passed to 'populate-root-file-system'." #:register-closures? #$register-closures? #:system-directory #$os + #:make-device-nodes + #$(match device-nodes + ('linux #~make-essential-device-nodes) + ('hurd #~make-hurd-device-nodes)) + ;; Disable deduplication to speed things up, ;; and because it doesn't help much for a ;; single system generation. |