summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-09-01 23:13:56 +0200
committerLudovic Courtès <ludo@gnu.org>2013-09-02 00:20:14 +0200
commitd91712ee894e3bcaabc51269d292cbe77ed89530 (patch)
tree13f3e5e6daaf435cf9bc16f0303ae944c766ed50 /gnu/packages
parentd9ff410fb279571826748dac51adc00379968bbc (diff)
downloadguix-d91712ee894e3bcaabc51269d292cbe77ed89530.tar.gz
gnu: linux-initrd: Factorize device node creation.
* guix/build/linux-initrd.scm (make-essential-device-nodes): New
  procedure.
* gnu/packages/linux-initrd.scm (qemu-initrd): Use it.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/linux-initrd.scm9
1 files changed, 3 insertions, 6 deletions
diff --git a/gnu/packages/linux-initrd.scm b/gnu/packages/linux-initrd.scm
index 17f42652e8..4a4e437635 100644
--- a/gnu/packages/linux-initrd.scm
+++ b/gnu/packages/linux-initrd.scm
@@ -270,10 +270,8 @@ the Linux kernel.")
         (unless (configure-qemu-networking)
           (display "network interface is DOWN\n"))
 
-        ;; Make the device nodes for QEMU's hard disk and partitions.
-        (mknod "/dev/vda" 'block-special #o644 (device-number 8 0))
-        (mknod "/dev/vda1" 'block-special #o644 (device-number 8 1))
-        (mknod "/dev/vda2" 'block-special #o644 (device-number 8 2))
+        ;; Make /dev nodes.
+        (make-essential-device-nodes)
 
         ;; Prepare the real root file system under /root.
         (unless (file-exists? "/root")
@@ -287,8 +285,7 @@ the Linux kernel.")
         (mkdir-p "/root/nix/store")
 
         (mkdir "/root/dev")
-        (mknod "/root/dev/null" 'char-special #o666 (device-number 1 3))
-        (mknod "/root/dev/zero" 'char-special #o666 (device-number 1 5))
+        (make-essential-device-nodes #:root "/root/dev")
 
         ;; Mount the host's store and exchange directory.
         (mount-qemu-smb-share "/store" "/root/nix/store")