diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-18 18:37:07 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-18 18:37:07 +0200 |
| commit | 48d90cf3b67d01dd7812ed62dfb916905e34e13a (patch) | |
| tree | 743e85017130d278e120b51e788aaab176370ba6 /nixos | |
| parent | 1e540af43bce0e23d72b338f5c8359e73ae49f38 (diff) | |
| download | nixlib-48d90cf3b67d01dd7812ed62dfb916905e34e13a.tar nixlib-48d90cf3b67d01dd7812ed62dfb916905e34e13a.tar.gz nixlib-48d90cf3b67d01dd7812ed62dfb916905e34e13a.tar.bz2 nixlib-48d90cf3b67d01dd7812ed62dfb916905e34e13a.tar.lz nixlib-48d90cf3b67d01dd7812ed62dfb916905e34e13a.tar.xz nixlib-48d90cf3b67d01dd7812ed62dfb916905e34e13a.tar.zst nixlib-48d90cf3b67d01dd7812ed62dfb916905e34e13a.zip | |
Revert "Put /nix/var/nix/{temproots,userpool} on a tmpfs"
This reverts commit dd49094a25057211d77a3dc4d075a749db748139. Nix barfs if /nix/var/nix/temproots is a symlink :-(
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 9 | ||||
| -rw-r--r-- | nixos/modules/system/boot/stage-2-init.sh | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 171fd08f1e1d..4bfd6268234d 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -336,13 +336,13 @@ in # Nix initialisation. mkdir -m 0755 -p \ /nix/var/nix/gcroots \ + /nix/var/nix/temproots \ /nix/var/nix/manifests \ + /nix/var/nix/userpool \ /nix/var/nix/profiles \ /nix/var/nix/db \ /nix/var/log/nix/drvs \ - /nix/var/nix/channel-cache \ - /run/nix/temproots \ - /run/nix/userpool + /nix/var/nix/channel-cache mkdir -m 1777 -p \ /nix/var/nix/gcroots/per-user \ /nix/var/nix/profiles/per-user \ @@ -350,9 +350,6 @@ in ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/ ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/ - - [ -d /nix/var/nix/temproots ] || ln -sfn /run/nix/temproots /nix/var/nix/temproots - [ -d /nix/var/nix/userpool ] || ln -sfn /run/nix/userpool /nix/var/nix/userpool ''; }; diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 5be38725ab72..cee9db091c14 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -106,7 +106,7 @@ fi # Also get rid of temporary GC roots. -rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots /nix/var/nix/userpool +rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots # Create a tmpfs on /run to hold runtime state for programs such as |