diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-10-26 22:58:54 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-10-26 22:58:54 +0200 |
| commit | 510051fc1264ace4ab657b52ec6fb5e2ccfda740 (patch) | |
| tree | b8c0a981b78f8cf6511b781eff05d90283c34997 /src | |
| parent | da8f9f8cff32029c74e9e566435079b2c5db0a5e (diff) | |
swap: add only swaps listed in /etc/fstab automatically to swap.target, others should be added via .wants/ links
Diffstat (limited to 'src')
| -rw-r--r-- | src/mount.c | 11 | ||||
| -rw-r--r-- | src/swap.c | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/mount.c b/src/mount.c index 3fc0f13716..d62ce8f408 100644 --- a/src/mount.c +++ b/src/mount.c @@ -265,7 +265,7 @@ static int mount_add_target_links(Mount *m) { MountParameters *p; Unit *tu; int r; - bool noauto, handle, automount, user; + bool noauto, handle, automount; assert(m); @@ -277,7 +277,6 @@ static int mount_add_target_links(Mount *m) { return 0; noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO); - user = mount_test_option(p->options, "user") || mount_test_option(p->options, "users"); handle = !!mount_test_option(p->options, "comment=systemd.mount") || m->meta.manager->mount_auto; automount = !!mount_test_option(p->options, "comment=systemd.automount"); @@ -311,10 +310,10 @@ static int mount_add_target_links(Mount *m) { * configured to local-fs.target */ if (!noauto && handle && - !m->from_fragment) - if (user || m->meta.manager->running_as == MANAGER_SYSTEM) - if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(m), true)) < 0) - return r; + m->from_etc_fstab && + m->meta.manager->running_as == MANAGER_SYSTEM) + if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(m), true)) < 0) + return r; return unit_add_dependency(UNIT(m), UNIT_BEFORE, tu, true); } diff --git a/src/swap.c b/src/swap.c index abd8cdd8d6..4404dc0e71 100644 --- a/src/swap.c +++ b/src/swap.c @@ -176,7 +176,7 @@ static int swap_add_target_links(Swap *s) { if (!p->noauto && (p->handle || s->meta.manager->swap_auto) && - !s->from_fragment && + s->from_etc_fstab && s->meta.manager->running_as == MANAGER_SYSTEM) if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(s), true)) < 0) return r; |