02/03: vm: ISO9660 images include /etc and other standard files.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 15c2ddc12460c9d1e26fb89639b460b8a0b3ffc0
Author: Ludovic Courtès <address@hidden>
Date:   Wed Nov 29 15:14:17 2017 +0100

    vm: ISO9660 images include /etc and other standard files.
    
    * gnu/build/vm.scm (make-iso9660-image): Call
    'populate-root-file-system' instead of a series of 'mkdir-p' calls.  Add
    /etc to the arguments of xorriso.
---
 gnu/build/vm.scm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm
index 7537f81..20ee127 100644
--- a/gnu/build/vm.scm
+++ b/gnu/build/vm.scm
@@ -378,11 +378,8 @@ SYSTEM-DIRECTORY is the name of the directory of the 
'system' derivation."
 GRUB configuration and OS-DRV as the stuff in it."
   (let ((grub-mkrescue (string-append grub "/bin/grub-mkrescue"))
         (target-store  (string-append "/tmp/root" (%store-directory))))
-    (mkdir-p "/tmp/root/var/run")
-    (mkdir-p "/tmp/root/run")
-    (mkdir-p "/tmp/root/mnt")
+    (populate-root-file-system os-drv "/tmp/root")
 
-    (mkdir-p target-store)
     (mount (%store-directory) target-store "" MS_BIND)
 
     (when register-closures?
@@ -399,6 +396,7 @@ GRUB configuration and OS-DRV as the stuff in it."
                           `(,grub-mkrescue "-o" ,target
                             ,(string-append "boot/grub/grub.cfg=" config-file)
                             ,(string-append "gnu/store=" os-drv "/..")
+                            "etc=/tmp/root/etc"
                             "var=/tmp/root/var"
                             "run=/tmp/root/run"
                             ;; /mnt is used as part of the installation