diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-12-08 21:22:22 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-12-08 22:43:56 +0100 |
| commit | 9b0ac8025860ac426cb1bc7fd417a27fe2bed36a (patch) | |
| tree | f2a703efdddbdf89b5cd79e83739bf7f743e3b26 /gnu/system/vm.scm | |
| parent | 677078b48f649588f588c6adef0bb0aba70f7c8c (diff) | |
| download | patches-9b0ac8025860ac426cb1bc7fd417a27fe2bed36a.tar patches-9b0ac8025860ac426cb1bc7fd417a27fe2bed36a.tar.gz | |
gnu: Populate /etc upon startup.
* gnu/packages/patches/dmd-getpw.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/system.scm (dmd): Use it.
* gnu/system/vm.scm (system-qemu-image): Don't explicitly populate /etc;
don't add ETC to the GC roots.
* gnu/system/dmd.scm (dmd-configuration-file): Add 'etc' parameter.
[config]: Populate /etc from there.
Diffstat (limited to 'gnu/system/vm.scm')
| -rw-r--r-- | gnu/system/vm.scm | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index ffbc07ee85..7afbd70044 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -577,7 +577,6 @@ Happy birthday, GNU! http://www.gnu.org/gnu30 (bash-file (package-file bash "bin/bash")) (dmd-file (package-file dmd "bin/dmd")) - (dmd-conf (dmd-configuration-file services)) (accounts -> (cons* (user-account (name "root") (password "") @@ -632,26 +631,15 @@ Happy birthday, GNU! http://www.gnu.org/gnu30 #:pam-services pam-services #:profile profile)) (etc -> (derivation->output-path etc-drv)) + (dmd-conf (dmd-configuration-file services etc)) (populate -> `((directory "/nix/store" 0 ,build-user-gid) (directory "/etc") (directory "/var/log") ; for dmd (directory "/var/run/nscd") - ("/etc/static" -> ,etc) - ("/etc/shadow" -> "/etc/static/shadow") - ("/etc/passwd" -> "/etc/static/passwd") - ("/etc/group" -> "/etc/static/group") - ("/etc/login.defs" -> "/etc/static/login.defs") - ("/etc/pam.d" -> "/etc/static/pam.d") - ("/etc/profile" -> "/etc/static/profile") - ("/etc/issue" -> "/etc/static/issue") - ("/etc/services" -> "/etc/static/services") - ("/etc/protocols" -> "/etc/static/protocols") - ("/etc/rpc" -> "/etc/static/rpc") (directory "/var/nix/gcroots") ("/var/nix/gcroots/default-profile" -> ,profile) - ("/var/nix/gcroots/etc-directory" -> ,etc) (directory "/tmp") (directory "/var/nix/profiles/per-user/root" 0 0) (directory "/var/nix/profiles/per-user/guest" |