diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-10-29 06:05:02 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-10-29 16:28:30 +0200 |
| commit | d91430063ed84a628890ef347571972bfd4272dd (patch) | |
| tree | 99528cd3d34fa64aafc6fcac8608c0a91e1b9e4c /src | |
| parent | e6a3ff9593e88a57390534b8ad3de7a57cafbdb0 (diff) | |
mount: don't pull in nofail mounts by default, but use them if they are around
Diffstat (limited to 'src')
| -rw-r--r-- | src/mount.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mount.c b/src/mount.c index 2f96625826..781c7a8721 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; + bool noauto, nofail, handle, automount; assert(m); @@ -277,6 +277,7 @@ static int mount_add_target_links(Mount *m) { return 0; noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO); + nofail = !!mount_test_option(p->options, "nofail"); handle = !!mount_test_option(p->options, "comment=systemd.mount") || m->meta.manager->mount_auto; automount = !!mount_test_option(p->options, "comment=systemd.automount"); @@ -309,6 +310,7 @@ static int mount_add_target_links(Mount *m) { /* Automatically add mount points that aren't natively * configured to local-fs.target */ if (!noauto && + !nofail && handle && m->from_etc_fstab && m->meta.manager->running_as == MANAGER_SYSTEM) |