diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-09-04 23:21:37 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-09-05 00:46:09 +0200 |
| commit | 7c1d8146a770d6b37b35cefc0ad8662f4c07df62 (patch) | |
| tree | f86944c8623f1333c4bf94fd5642fe86411002a6 /gnu/packages/linux-initrd.scm | |
| parent | e911470857069b20c767d2a581b3ab640ac876db (diff) | |
| download | guix-patches-7c1d8146a770d6b37b35cefc0ad8662f4c07df62.tar guix-patches-7c1d8146a770d6b37b35cefc0ad8662f4c07df62.tar.gz | |
gnu: vm: 'qemu-image' populates /dev on the target root file system.
* gnu/system/vm.scm (qemu-image): Use (guix build linux-initrd). Remove
'mknod' calls; use 'make-essential-device-nodes' to populate /dev on
the target image.
* gnu/packages/linux-initrd.scm (qemu-initrd): When /root/dev exists,
don't call 'make-essential-device-nodes'.
Diffstat (limited to 'gnu/packages/linux-initrd.scm')
| -rw-r--r-- | gnu/packages/linux-initrd.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/linux-initrd.scm b/gnu/packages/linux-initrd.scm index 4a4e437635..ab8787f02c 100644 --- a/gnu/packages/linux-initrd.scm +++ b/gnu/packages/linux-initrd.scm @@ -284,8 +284,9 @@ the Linux kernel.") (mkdir "/root/xchg") (mkdir-p "/root/nix/store") - (mkdir "/root/dev") - (make-essential-device-nodes #:root "/root/dev") + (unless (file-exists? "/root/dev") + (mkdir "/root/dev") + (make-essential-device-nodes #:root "/root")) ;; Mount the host's store and exchange directory. (mount-qemu-smb-share "/store" "/root/nix/store") |