shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-08 08:58:27 +03:00
Code

umount: /usr/ should never be unmounted regardless of HAVE_SPLIT_USR or not

Browse Source 
Whether we put some binaries in /bin or in /usr/bin should not have any
effect on unmounting during shutdown. Even if people split /usr/ off we
should not try to unmount it, no matter what as it is simply where
binaries are placed.
This commit is contained in:
Lennart Poettering 2023-06-03 09:17:45 +02:00 committed by Luca Boccassi
parent 0470f91983
commit 798e811733
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/shutdown/umount.c
View File

@ -168,11 +168,10 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) {
}
static bool nonunmountable_path(const char *path) {
return path_equal(path, "/")
#if ! HAVE_SPLIT_USR
|| path_equal(path, "/usr")
#endif
|| path_startswith(path, "/run/initramfs");
assert(path);
return PATH_IN_SET(path, "/", "/usr") ||
path_startswith(path, "/run/initramfs");
}
static void log_umount_blockers(const char *mnt) {