diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-18 16:56:20 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-18 16:56:20 +0200 |
| commit | dd49094a25057211d77a3dc4d075a749db748139 (patch) | |
| tree | 30636ed17df123355e348f8f51c10f1dd9f0ff3d /nixos/modules | |
| parent | c13cede19d7ad1088e3eda358eb57890ef59bec7 (diff) | |
| download | nixlib-dd49094a25057211d77a3dc4d075a749db748139.tar nixlib-dd49094a25057211d77a3dc4d075a749db748139.tar.gz nixlib-dd49094a25057211d77a3dc4d075a749db748139.tar.bz2 nixlib-dd49094a25057211d77a3dc4d075a749db748139.tar.lz nixlib-dd49094a25057211d77a3dc4d075a749db748139.tar.xz nixlib-dd49094a25057211d77a3dc4d075a749db748139.tar.zst nixlib-dd49094a25057211d77a3dc4d075a749db748139.zip | |
Put /nix/var/nix/{temproots,userpool} on a tmpfs
Diffstat (limited to 'nixos/modules')
| -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, 7 insertions, 4 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 4bfd6268234d..171fd08f1e1d 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 + /nix/var/nix/channel-cache \ + /run/nix/temproots \ + /run/nix/userpool mkdir -m 1777 -p \ /nix/var/nix/gcroots/per-user \ /nix/var/nix/profiles/per-user \ @@ -350,6 +350,9 @@ 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 cee9db091c14..5be38725ab72 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 +rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots /nix/var/nix/userpool # Create a tmpfs on /run to hold runtime state for programs such as |