nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2017-11-29 15:14:17 +01:00
parent 748d4a84d1
commit 15c2ddc124
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/build/vm.scm
View File

@ -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." GRUB configuration and OS-DRV as the stuff in it."
(let ((grub-mkrescue (string-append grub "/bin/grub-mkrescue")) (let ((grub-mkrescue (string-append grub "/bin/grub-mkrescue"))
(target-store (string-append "/tmp/root" (%store-directory)))) (target-store (string-append "/tmp/root" (%store-directory))))
(mkdir-p "/tmp/root/var/run") (populate-root-file-system os-drv "/tmp/root")
(mkdir-p "/tmp/root/run")
(mkdir-p "/tmp/root/mnt")
(mkdir-p target-store)
(mount (%store-directory) target-store "" MS_BIND) (mount (%store-directory) target-store "" MS_BIND)
(when register-closures? (when register-closures?
@ -399,6 +396,7 @@ GRUB configuration and OS-DRV as the stuff in it."
`(,grub-mkrescue "-o" ,target `(,grub-mkrescue "-o" ,target
,(string-append "boot/grub/grub.cfg=" config-file) ,(string-append "boot/grub/grub.cfg=" config-file)
,(string-append "gnu/store=" os-drv "/..") ,(string-append "gnu/store=" os-drv "/..")
"etc=/tmp/root/etc"
"var=/tmp/root/var" "var=/tmp/root/var"
"run=/tmp/root/run" "run=/tmp/root/run"
;; /mnt is used as part of the installation ;; /mnt is used as part of the installation