diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-06-19 03:15:59 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-06-19 03:15:59 +0200 |
| commit | a3d4e06dfa234bf2a9398c8e534b705b68aa50a1 (patch) | |
| tree | 41d9a99c9827fa9fac302c15c382ae6dc941a40c /src/mount.c | |
| parent | 5e8d1c9a9f15b7453474dc4879bdb4021c3f50a1 (diff) | |
manager: get rid of destinction between running_as=system and running_as=init, as there is little value in it and we cannot really test this
Diffstat (limited to 'src/mount.c')
| -rw-r--r-- | src/mount.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mount.c b/src/mount.c index 94f19294fd..c95581fd1e 100644 --- a/src/mount.c +++ b/src/mount.c @@ -254,7 +254,7 @@ static int mount_add_target_links(Mount *m) { if ((r = manager_load_unit(UNIT(m)->meta.manager, target, NULL, &tu)) < 0) return r; - if (automount && m->meta.manager->running_as != MANAGER_SESSION) { + if (automount && m->meta.manager->running_as == MANAGER_SYSTEM) { Unit *am; if ((r = unit_load_related_unit(UNIT(m), ".automount", &am)) < 0) @@ -268,7 +268,7 @@ static int mount_add_target_links(Mount *m) { } else { if (!noauto && handle) - if (user || m->meta.manager->running_as != MANAGER_SESSION) + if (user || m->meta.manager->running_as == MANAGER_SYSTEM) if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(m), true)) < 0) return r; @@ -341,9 +341,7 @@ static int mount_load(Unit *u) { what = m->parameters_proc_self_mountinfo.what; if (what) - if ((r = unit_add_node_link(u, what, - (u->meta.manager->running_as == MANAGER_INIT || - u->meta.manager->running_as == MANAGER_SYSTEM))) < 0) + if ((r = unit_add_node_link(u, what, u->meta.manager->running_as == MANAGER_SYSTEM)) < 0) return r; if ((r = mount_add_mount_links(m)) < 0) |