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

mount: add implicit umount.target conflicts only in system mode

Browse source
This commit is contained in:
Lennart Poettering 2010-07-10 04:46:58 +02:00
parent 5682009b21
commit 73c33e7f22
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/automount.c
View file

@ -201,7 +201,8 @@ static int automount_load(Unit *u) {
if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(a->mount), true)) < 0)
return r;
if (a->meta.default_dependencies)
if (a->meta.default_dependencies &&
a->meta.manager->running_as == MANAGER_SYSTEM)
if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
return r;
}

4
src/mount.c
View file

@ -368,7 +368,9 @@ static int mount_load(Unit *u) {
if ((r = unit_add_default_cgroup(u)) < 0)
return r;
if (m->meta.default_dependencies && !path_equal(m->where, "/"))
if (m->meta.default_dependencies &&
m->meta.manager->running_as == MANAGER_SYSTEM &&
!path_equal(m->where, "/"))
if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
return r;
}