mount: don't pull in nofail mounts by default, but use them if they are around

[elogind.git] / src / mount.c

diff --git a/src/mount.c b/src/mount.c
index d62ce8f40893de885c2ce8b54344cdcfe2e77269..781c7a8721f24172f36c2c5256b3a9eb3de9936e 100644 (file)
--- 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;
         MountParameters *p;
         Unit *tu;
         int r;

-        bool noauto, handle, automount;
+        bool noauto, nofail, handle, automount;

 
         assert(m);
 
 
         assert(m);
 


@@ -277,6 +277,7 @@ static int mount_add_target_links(Mount *m) {
                 return 0;
 
         noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO);
                 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");
         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 &&
                 /* 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)
                     handle &&
                     m->from_etc_fstab &&
                     m->meta.manager->running_as == MANAGER_SYSTEM)


@@ -398,7 +400,7 @@ static int mount_add_default_dependencies(Mount *m) {
                 if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_BEFORE, SPECIAL_QUOTACHECK_SERVICE, NULL, true)) < 0)
                         return r;
 
                 if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_BEFORE, SPECIAL_QUOTACHECK_SERVICE, NULL, true)) < 0)
                         return r;
 

-                if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
+                if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)

                         return r;
         }
 
                         return r;
         }