diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-03-17 18:26:46 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-03-17 18:26:46 +0100 |
| commit | 0562dbe5d3160b72856bfa7d890ec2caf4073633 (patch) | |
| tree | 56849a825f679cbd2e02ca03e42bbd8f9ff44a45 /gnu/system/vm.scm | |
| parent | bfb6b1c7b788a5fbcffb089c0df9d254faed4d5b (diff) | |
| parent | 9b43a0ffa3869e56063cd4dea054828e53113c4b (diff) | |
| download | guix-0562dbe5d3160b72856bfa7d890ec2caf4073633.tar guix-0562dbe5d3160b72856bfa7d890ec2caf4073633.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/system/vm.scm')
| -rw-r--r-- | gnu/system/vm.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index b6a777353f..a23289a30b 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -373,7 +373,7 @@ such as /etc files." ;; (not 'futime'), so the timestamp of ;; symlinks cannot be changed, and there ;; are symlinks here pointing to - ;; /nix/store, which is the host, + ;; /gnu/store, which is the host, ;; read-only store. (unless (eq? (stat:type s) 'symlink) (utime file 0 0 0 0)))) @@ -448,7 +448,7 @@ basic contents of the root file system of OS." (os-dir -> (derivation->output-path os-drv)) (build-gid (operating-system-build-gid os)) (profile (operating-system-profile-directory os))) - (return `((directory "/nix/store" 0 ,(or build-gid 0)) + (return `((directory ,(%store-prefix) 0 ,(or build-gid 0)) (directory "/etc") (directory "/var/log") ; for dmd (directory "/var/run/nscd") |