picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #2794 from jhol/dont-unmount-initramfs-mounts

Browse source 
core/mount: Don't unmount initramfs mounts
This commit is contained in:
Daniel Mack 2016-03-10 15:24:21 +01:00
parent ead02a14ed 04a9393122
commit bffac070d0
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/mount.c
View file

@ -378,7 +378,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);
@ -402,13 +403,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"))

1
src/core/umount.c
View file

@ -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;