From fd9c882581877eef8ba1b34a9502a1ff546b3833 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Apr 2013 13:16:57 +0200 Subject: [PATCH 03/27] Don't try to unmount /nix or /nix/store They'll still be remounted read-only. https://github.com/NixOS/nixos/issues/126 --- src/core/mount.c | 4 +++- src/shutdown/umount.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/mount.c b/src/core/mount.c index a0dfa6a1a7..4ca6adcdc6 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -414,6 +414,8 @@ static bool mount_is_extrinsic(Mount *m) { if (PATH_IN_SET(m->where, /* Don't bother with the OS data itself */ "/", /* (strictly speaking redundant: should already be covered by the perpetual flag check above) */ + "/nix", + "/nix/store", "/usr", "/etc")) return true; diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c index 2d07d3d6c1..8b112f464e 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c @@ -373,6 +373,8 @@ static int delete_dm(dev_t devnum) { static bool nonunmountable_path(const char *path) { return path_equal(path, "/") + || path_equal(path, "/nix") + || path_equal(path, "/nix/store") #if ! HAVE_SPLIT_USR || path_equal(path, "/usr") #endif -- 2.25.1