public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Put /nix/var/nix/{temproots,userpool} on a tmpfs" 

This reverts commit dd49094a25. Nix
barfs if /nix/var/nix/temproots is a symlink :-(
This commit is contained in:
Eelco Dolstra 2014-04-18 18:37:07 +02:00
parent 1e540af43b
commit 48d90cf3b6
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/services/misc/nix-daemon.nix
View File

@ -336,13 +336,13 @@ in
# Nix initialisation. # Nix initialisation.
mkdir -m 0755 -p \ mkdir -m 0755 -p \
/nix/var/nix/gcroots \ /nix/var/nix/gcroots \
/nix/var/nix/temproots \
/nix/var/nix/manifests \ /nix/var/nix/manifests \
/nix/var/nix/userpool \
/nix/var/nix/profiles \ /nix/var/nix/profiles \
/nix/var/nix/db \ /nix/var/nix/db \
/nix/var/log/nix/drvs \ /nix/var/log/nix/drvs \
/nix/var/nix/channel-cache \ /nix/var/nix/channel-cache
/run/nix/temproots \
/run/nix/userpool
mkdir -m 1777 -p \ mkdir -m 1777 -p \
/nix/var/nix/gcroots/per-user \ /nix/var/nix/gcroots/per-user \
/nix/var/nix/profiles/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/profiles /nix/var/nix/gcroots/
ln -sf /nix/var/nix/manifests /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
''; '';
}; };

2
nixos/modules/system/boot/stage-2-init.sh
View File

@ -106,7 +106,7 @@ fi
# Also get rid of temporary GC roots. # 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 # Create a tmpfs on /run to hold runtime state for programs such as