diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-18 16:50:37 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-18 16:50:37 +0200 |
| commit | c13cede19d7ad1088e3eda358eb57890ef59bec7 (patch) | |
| tree | e3606b5a697d81bb20a00082bb29ff5a1674ab33 | |
| parent | 21573af9fb0b53806703c44b46d813b0c5d6efa5 (diff) | |
| download | nixlib-c13cede19d7ad1088e3eda358eb57890ef59bec7.tar nixlib-c13cede19d7ad1088e3eda358eb57890ef59bec7.tar.gz nixlib-c13cede19d7ad1088e3eda358eb57890ef59bec7.tar.bz2 nixlib-c13cede19d7ad1088e3eda358eb57890ef59bec7.tar.lz nixlib-c13cede19d7ad1088e3eda358eb57890ef59bec7.tar.xz nixlib-c13cede19d7ad1088e3eda358eb57890ef59bec7.tar.zst nixlib-c13cede19d7ad1088e3eda358eb57890ef59bec7.zip | |
Remove long-obsolete /nix/var/nix/chroots directory
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 3 | ||||
| -rw-r--r-- | nixos/modules/system/boot/stage-2-init.sh | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 09a874481dc6..4bfd6268234d 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -342,8 +342,7 @@ in /nix/var/nix/profiles \ /nix/var/nix/db \ /nix/var/log/nix/drvs \ - /nix/var/nix/channel-cache \ - /nix/var/nix/chroots + /nix/var/nix/channel-cache mkdir -m 1777 -p \ /nix/var/nix/gcroots/per-user \ /nix/var/nix/profiles/per-user \ diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 62e08bb9ece5..cee9db091c14 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -104,12 +104,6 @@ if test -n "@cleanTmpDir@"; then echo " done" fi -# This is a good time to clean up /nix/var/nix/chroots. Doing an `rm -# -rf' on it isn't safe in general because it can contain bind mounts -# to /nix/store and other places. But after rebooting these are all -# gone, of course. -rm -rf /nix/var/nix/chroots # recreated in activate-configuration.sh - # Also get rid of temporary GC roots. rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots |