diff options
| author | Joel Holdsworth <joel.holdsworth@vcatechnology.com> | 2016-03-03 17:25:53 +0000 |
|---|---|---|
| committer | Joel Holdsworth <joel.holdsworth@vcatechnology.com> | 2016-03-04 15:16:34 +0000 |
| commit | 04a9393122d79a3d14506459b0f2c5348673464c (patch) | |
| tree | 85e50d8739e61e9475038bd6b2a5519bb37a994c | |
| parent | 9f0cd100d0dbc7c9b55e99bacb4034402a60b389 (diff) | |
core/mount: Don't unmount initramfs mounts
A mount within /run/initramfs is indicative that the mount was
created by initramfs init and will be unmounted by initramfs
shutdown.
It is unlikely that such a mount point would even be unmountable
by the the main system, for example in the case of the root file-
system being loop-mounted from a file in a /run/initramfs mount.
| -rw-r--r-- | src/core/mount.c | 15 | ||||
| -rw-r--r-- | src/core/umount.c | 1 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/core/mount.c b/src/core/mount.c index 93d2bd595c..540ec5fdda 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -369,7 +369,8 @@ static bool should_umount(Mount *m) { MountParameters *p; if (path_equal(m->where, "/") || - path_equal(m->where, "/usr")) + path_equal(m->where, "/usr") || + path_startswith(m->where, "/run/initramfs")) return false; p = get_mount_parameters(m); @@ -393,13 +394,15 @@ static int mount_add_default_dependencies(Mount *m) { if (UNIT(m)->manager->running_as != MANAGER_SYSTEM) return 0; - /* We do not add any default dependencies to / and /usr, since - * they are guaranteed to stay mounted the whole time, since - * our system is on it. Also, don't bother with anything - * mounted below virtual file systems, it's also going to be - * virtual, and hence not worth the effort. */ + /* We do not add any default dependencies to /, /usr or + * /run/initramfs/, since they are guaranteed to stay + * mounted the whole time, since our system is on it. + * 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_equal(m->where, "/") || path_equal(m->where, "/usr") || + path_startswith(m->where, "/run/initramfs") || path_startswith(m->where, "/proc") || path_startswith(m->where, "/sys") || path_startswith(m->where, "/dev")) diff --git a/src/core/umount.c b/src/core/umount.c index b953fcc152..c21a2be54e 100644 --- a/src/core/umount.c +++ b/src/core/umount.c @@ -412,6 +412,7 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e #ifndef HAVE_SPLIT_USR || path_equal(m->path, "/usr") #endif + || path_startswith(m->path, "/run/initramfs") ) continue; |