From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Mon, 19 Jun 2023 02:11:35 +0200 Subject: [PATCH] Don't try to unmount /nix or /nix/store They'll still be remounted read-only. https://github.com/NixOS/nixos/issues/126 Original-Author: Eelco Dolstra --- src/shared/fstab-util.c | 2 ++ src/shutdown/umount.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c index 25e229bf3e..b9af1c3b13 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-util.c @@ -76,6 +76,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { /* Don't bother with the OS data itself */ if (PATH_IN_SET(mount, "/", + "/nix", + "/nix/store", "/usr", "/etc")) return true; diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c index 7729a1d415..744abeee23 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c @@ -178,8 +178,10 @@ int mount_points_list_get(FILE *f, MountPoint **head) { static bool nonunmountable_path(const char *path) { assert(path); - return PATH_IN_SET(path, "/", "/usr") || - path_startswith(path, "/run/initramfs"); + return PATH_IN_SET(path, "/", "/usr") + || path_equal(path, "/nix") + || path_equal(path, "/nix/store") + || path_startswith(path, "/run/initramfs"); } static void log_umount_blockers(const char *mnt) {