diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-07-10 04:46:58 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-07-10 04:46:58 +0200 |
| commit | 73c33e7f225f81e6066386fba997e8ea2ba361b3 (patch) | |
| tree | 1be264f92b35c211bb966d1167a230e8f91741f8 | |
| parent | 5682009b2153badf0c3d07baf574ef1b1547a5c5 (diff) | |
mount: add implicit umount.target conflicts only in system mode
| -rw-r--r-- | src/automount.c | 3 | ||||
| -rw-r--r-- | src/mount.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/automount.c b/src/automount.c index 26fec45107..934aa5f35d 100644 --- a/src/automount.c +++ b/src/automount.c @@ -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; } diff --git a/src/mount.c b/src/mount.c index 57c258f9f2..36caae3c81 100644 --- a/src/mount.c +++ b/src/mount.c @@ -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; } |