mount,crypto: rework meaning of noauto/nofail

2 files changed, 72 insertions, 39 deletions

diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c
index 858aed82d1..696f44ae36 100644
--- a/src/cryptsetup-generator.c
+++ b/src/cryptsetup-generator.c
@@ -67,10 +67,14 @@ static int create_disk(
         char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL;
         int r;
         FILE *f = NULL;
+        bool noauto, nofail;
 
         assert(name);
         assert(device);
 
+        noauto = has_option(options, "noauto");
+        nofail = has_option(options, "nofail");
+
         if (!(n = unit_name_build_escape("cryptsetup", name, ".service"))) {
                 r = -ENOMEM;
                 log_error("Failed to allocate unit name.");
@@ -104,12 +108,17 @@ static int create_disk(
         fprintf(f,
                 "[Unit]\n"
                 "Description=Cryptography Setup for %%I\n"
+                "Conflicts=umount.target\n"
                 "DefaultDependencies=no\n"
                 "BindTo=%s dev-mapper-%%i.device\n"
                 "After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n"
-                "Before=shutdown.target cryptsetup.target\n",
+                "Before=umount.target\n",
                 d, d);
 
+        if (!nofail)
+                fprintf(f,
+                        "Before=cryptsetup.target\n");
+
         if (password && (streq(password, "/dev/urandom") ||
                          streq(password, "/dev/random") ||
                          streq(password, "/dev/hw_random")))
@@ -149,7 +158,7 @@ static int create_disk(
                 goto fail;
         }
 
-        if (!has_option(options, "noauto")) {
+        if (!noauto) {
 
                 if (asprintf(&to, "%s/%s.wants/%s", arg_dest, d, n) < 0) {
                         r = -ENOMEM;
@@ -167,20 +176,22 @@ static int create_disk(
                 free(to);
                 to = NULL;
 
-                if (!has_option(options, "nofail")) {
+                if (!nofail)
+                        asprintf(&to, "%s/cryptsetup.target.requires/%s", arg_dest, n);
+                else
+                        asprintf(&to, "%s/cryptsetup.target.wants/%s", arg_dest, n);
 
-                        if (asprintf(&to, "%s/cryptsetup.target.wants/%s", arg_dest, n) < 0) {
-                                r = -ENOMEM;
-                                goto fail;
-                        }
+                if (!to) {
+                        r = -ENOMEM;
+                        goto fail;
+                }
 
-                        mkdir_parents(to, 0755);
+                mkdir_parents(to, 0755);
 
-                        if (symlink(from, to) < 0) {
-                                log_error("Failed to create symlink '%s' to '%s': %m", from, to);
-                                r = -errno;
-                                goto fail;
-                        }
+                if (symlink(from, to) < 0) {
+                        log_error("Failed to create symlink '%s' to '%s': %m", from, to);
+                        r = -errno;
+                        goto fail;
                 }
         }
 
diff --git a/src/mount.c b/src/mount.c
index 6205cb7f5a..4b300364af 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -323,7 +323,7 @@ static bool needs_quota(MountParameters *p) {
                 mount_test_option(p->options, "grpquota");
 }
 
-static int mount_add_target_links(Mount *m) {
+static int mount_add_fstab_links(Mount *m) {
         const char *target, *after = NULL;
         MountParameters *p;
         Unit *tu;
@@ -332,27 +332,36 @@ static int mount_add_target_links(Mount *m) {
 
         assert(m);
 
+        if (m->meta.manager->running_as != MANAGER_SYSTEM)
+                return 0;
+
         if (!(p = get_mount_parameters_configured(m)))
                 return 0;
 
-        noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO);
+        if (p != &m->parameters_etc_fstab)
+                return 0;
+
+        noauto = !!mount_test_option(p->options, "noauto");
         nofail = !!mount_test_option(p->options, "nofail");
+        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") ||
                 m->meta.manager->mount_auto;
-        automount =
-                mount_test_option(p->options, "comment=systemd.automount") ||
-                mount_test_option(p->options, "x-systemd-automount");
 
         if (mount_is_network(p)) {
                 target = SPECIAL_REMOTE_FS_TARGET;
-
-                if (m->meta.manager->running_as == MANAGER_SYSTEM)
-                        after = SPECIAL_NETWORK_TARGET;
+                after = SPECIAL_NETWORK_TARGET;
         } else
                 target = SPECIAL_LOCAL_FS_TARGET;
 
+        if (!path_equal(m->where, "/"))
+                if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
+                        return r;
+
         if ((r = manager_load_unit(m->meta.manager, target, NULL, NULL, &tu)) < 0)
                 return r;
 
@@ -360,27 +369,36 @@ static int mount_add_target_links(Mount *m) {
                 if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true)) < 0)
                         return r;
 
-        if (automount && m->meta.manager->running_as == MANAGER_SYSTEM) {
+        if (automount) {
                 Unit *am;
 
                 if ((r = unit_load_related_unit(UNIT(m), ".automount", &am)) < 0)
                         return r;
 
-                return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_WANTS, UNIT(am), true);
-        } else {
+                /* If auto is configured as well also pull in the
+                 * mount right-away, but don't rely on it. */
+                if (!noauto) /* automount + auto */
+                        if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(m), true)) < 0)
+                                return r;
+
+                /* Install automount unit */
+                if (!nofail) /* automount + fail */
+                        return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_REQUIRES, UNIT(am), true);
+                else /* automount + nofail */
+                        return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_WANTS, UNIT(am), true);
+
+        } else if (handle && !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)
-                        if ((r = unit_add_dependency(tu, UNIT_WANTS, UNIT(m), true)) < 0)
-                                return r;
 
-                return unit_add_dependency(UNIT(m), UNIT_BEFORE, tu, true);
+                if (!nofail) /* auto + fail */
+                        return unit_add_two_dependencies(tu, UNIT_AFTER, UNIT_REQUIRES, UNIT(m), true);
+                else /* auto + nofail */
+                        return unit_add_dependency(tu, UNIT_WANTS, UNIT(m), true);
         }
+
+        return 0;
 }
 
 static int mount_add_device_links(Mount *m) {
@@ -395,10 +413,12 @@ static int mount_add_device_links(Mount *m) {
         if (!p->what)
                 return 0;
 
-        if (!mount_is_bind(p) && !path_equal(m->where, "/")) {
+        if (!mount_is_bind(p) &&
+            !path_equal(m->where, "/") &&
+            p == &m->parameters_etc_fstab) {
                 bool nofail, noauto;
 
-                noauto = !!mount_test_option(p->options, MNTOPT_NOAUTO);
+                noauto = !!mount_test_option(p->options, "noauto");
                 nofail = !!mount_test_option(p->options, "nofail");
 
                 if ((r = unit_add_node_link(UNIT(m), p->what,
@@ -565,6 +585,8 @@ static int mount_load(Unit *u) {
 
                 if (m->meta.fragment_path)
                         m->from_fragment = true;
+                else if (m->from_etc_fstab)
+                        m->meta.default_dependencies = false;
 
                 if (!m->where)
                         if (!(m->where = unit_name_to_path(u->meta.id)))
@@ -594,16 +616,16 @@ static int mount_load(Unit *u) {
                 if ((r = mount_add_automount_links(m)) < 0)
                         return r;
 
-                if ((r = mount_add_target_links(m)) < 0)
-                        return r;
-
-                if ((r = unit_add_default_cgroups(u)) < 0)
+                if ((r = mount_add_fstab_links(m)) < 0)
                         return r;
 
                 if (m->meta.default_dependencies)
                         if ((r = mount_add_default_dependencies(m)) < 0)
                                 return r;
 
+                if ((r = unit_add_default_cgroups(u)) < 0)
+                        return r;
+
                 mount_fix_timeouts(m);
         }
 
@@ -1510,7 +1532,7 @@ static int mount_load_etc_fstab(Manager *m) {
                                                  what,
                                                  NULL,
                                                  pri,
-                                                 !!mount_test_option(me->mnt_opts, MNTOPT_NOAUTO),
+                                                 !!mount_test_option(me->mnt_opts, "noauto"),
                                                  !!mount_test_option(me->mnt_opts, "nofail"),
                                                  !!mount_test_option(me->mnt_opts, "comment=systemd.swapon"),
                                                  false);