Don't try to unmount /nix or /nix/store

33f4586 wasn't enough.
triton · Nov 4, 2016 · c9411a2 · c9411a2
1 parent 6ee3d20
commit c9411a2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/mount.c b/src/core/mount.c
@@ -390,7 +390,7 @@ static int mount_add_quota_links(Mount *m) {
 static bool should_umount(Mount *m) {
         MountParameters *p;
 
-        if (PATH_IN_SET(m->where, "/", "/usr") ||
+        if (PATH_IN_SET(m->where, "/", "/nix", "/nix/store") ||
             path_startswith(m->where, "/run/initramfs"))
                 return false;
 
@@ -421,7 +421,7 @@ static int mount_add_default_dependencies(Mount *m) {
          * Also, don't bother with anything mounted below virtual
          * file systems, it's also going to be virtual, and hence
          * not worth the effort. */
-        if (PATH_IN_SET(m->where, "/", "/usr") ||
+        if (PATH_IN_SET(m->where, "/", "/nix", "/nix/store") ||
             path_startswith(m->where, "/run/initramfs") ||
             path_startswith(m->where, "/proc") ||
             path_startswith(m->where, "/sys") ||