diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-04-24 13:53:31 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-04-24 13:53:34 +0200 |
| commit | 8d8e945624a0080073d94941f3032b8fa3b3aa15 (patch) | |
| tree | 502fbc4700f5e093fe094cad2e49c957e626cd3f /src/core/mount.c | |
| parent | 25f5971b5e0b3ab5b91a7d0359cd7f5a5094c1d0 (diff) | |
manager: drop MountAuto= and SwapAuto= options
The ability to set MountAuto=no and SwapAuto=no was useful during the
adoption phase of systemd, so that distributions could stick to their
classic mount scripts a bit longer. It is about time to get rid of it
now.
Diffstat (limited to 'src/core/mount.c')
| -rw-r--r-- | src/core/mount.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/core/mount.c b/src/core/mount.c index dbd4893bc..e662af0c8 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -325,7 +325,7 @@ static int mount_add_fstab_links(Mount *m) { MountParameters *p; Unit *tu; int r; - bool noauto, nofail, handle, automount; + bool noauto, nofail, automount; assert(m); @@ -343,11 +343,6 @@ static int mount_add_fstab_links(Mount *m) { automount = mount_test_option(p->options, "comment=systemd.automount") || mount_test_option(p->options, "x-systemd-automount"); - handle = - automount || - mount_test_option(p->options, "comment=systemd.mount") || - mount_test_option(p->options, "x-systemd-mount") || - UNIT(m)->manager->mount_auto; if (mount_is_network(p)) { target = SPECIAL_REMOTE_FS_TARGET; @@ -391,7 +386,7 @@ static int mount_add_fstab_links(Mount *m) { else /* automount + nofail */ return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_WANTS, am, true); - } else if (handle && !noauto) { + } else if (!noauto) { /* Automatically add mount points that aren't natively * configured to local-fs.target */ @@ -1574,7 +1569,6 @@ static int mount_load_etc_fstab(Manager *m) { pri, !!mount_test_option(me->mnt_opts, "noauto"), !!mount_test_option(me->mnt_opts, "nofail"), - !!mount_test_option(me->mnt_opts, "comment=systemd.swapon"), false); } else k = mount_add_one(m, what, where, me->mnt_opts, me->mnt_type, me->mnt_passno, false, false); |