core: do not add default dependencies to /usr mount unit

[elogind.git] / src / core / mount.c

diff --git a/src/core/mount.c b/src/core/mount.c
index 21b7942946721d4c9ed3660d33110a0c101b0c73..39a9aaf2a0bf35e0ff333c9d0116a7512db6002c 100644 (file)
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -163,7 +163,12 @@ static int mount_arm_timer(Mount *m) {
                 return sd_event_source_set_enabled(m->timer_event_source, SD_EVENT_ONESHOT);
         }
 
                 return sd_event_source_set_enabled(m->timer_event_source, SD_EVENT_ONESHOT);
         }
 

-        return sd_event_add_monotonic(UNIT(m)->manager->event, &m->timer_event_source, now(CLOCK_MONOTONIC) + m->timeout_usec, 0, mount_dispatch_timer, m);
+        return sd_event_add_time(
+                        UNIT(m)->manager->event,
+                        &m->timer_event_source,
+                        CLOCK_MONOTONIC,
+                        now(CLOCK_MONOTONIC) + m->timeout_usec, 0,
+                        mount_dispatch_timer, m);

 }
 
 static void mount_unwatch_control_pid(Mount *m) {
 }
 
 static void mount_unwatch_control_pid(Mount *m) {


@@ -375,7 +380,8 @@ static int mount_add_default_dependencies(Mount *m) {
         if (!p)
                 return 0;
 
         if (!p)
                 return 0;
 

-        if (path_equal(m->where, "/"))
+        if (path_equal(m->where, "/") ||
+            path_equal(m->where, "/usr"))

                 return 0;
 
         if (mount_is_network(p)) {
                 return 0;
 
         if (mount_is_network(p)) {


@@ -413,57 +419,6 @@ static int mount_add_default_dependencies(Mount *m) {
         return 0;
 }
 
         return 0;
 }
 

-static int mount_fix_timeouts(Mount *m) {
-        MountParameters *p;
-        const char *timeout = NULL;
-        Unit *other;
-        Iterator i;
-        usec_t u;
-        char *t;
-        int r;
-
-        assert(m);
-
-        p = get_mount_parameters_fragment(m);
-        if (!p)
-                return 0;
-
-        /* Allow configuration how long we wait for a device that
-         * backs a mount point to show up. This is useful to support
-         * endless device timeouts for devices that show up only after
-         * user input, like crypto devices. */
-
-        if ((timeout = mount_test_option(p->options, "comment=systemd.device-timeout")))
-                timeout += 31;
-        else if ((timeout = mount_test_option(p->options, "x-systemd.device-timeout")))
-                timeout += 25;
-        else
-                return 0;
-
-        t = strndup(timeout, strcspn(timeout, ",;" WHITESPACE));
-        if (!t)
-                return -ENOMEM;
-
-        r = parse_sec(t, &u);
-        free(t);
-
-        if (r < 0) {
-                log_warning_unit(UNIT(m)->id,
-                                 "Failed to parse timeout for %s, ignoring: %s",
-                                 m->where, timeout);
-                return r;
-        }
-
-        SET_FOREACH(other, UNIT(m)->dependencies[UNIT_AFTER], i) {
-                if (other->type != UNIT_DEVICE)
-                        continue;
-
-                other->job_timeout = u;
-        }
-
-        return 0;
-}
-

 static int mount_verify(Mount *m) {
         _cleanup_free_ char *e = NULL;
         bool b;
 static int mount_verify(Mount *m) {
         _cleanup_free_ char *e = NULL;
         bool b;


@@ -551,10 +506,6 @@ static int mount_add_extras(Mount *m) {
         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 

-        r = mount_fix_timeouts(m);
-        if (r < 0)
-                return r;
-

         if (u->default_dependencies) {
                 r = mount_add_default_dependencies(m);
                 if (r < 0)
         if (u->default_dependencies) {
                 r = mount_add_default_dependencies(m);
                 if (r < 0)


@@ -887,6 +838,7 @@ static void mount_enter_unmounting(Mount *m) {
         if ((r = exec_command_set(
                              m->control_command,
                              "/bin/umount",
         if ((r = exec_command_set(
                              m->control_command,
                              "/bin/umount",

+                             "-n",

                              m->where,
                              NULL)) < 0)
                 goto fail;
                              m->where,
                              NULL)) < 0)
                 goto fail;


@@ -929,6 +881,7 @@ static void mount_enter_mounting(Mount *m) {
                 r = exec_command_set(
                                 m->control_command,
                                 "/bin/mount",
                 r = exec_command_set(
                                 m->control_command,
                                 "/bin/mount",

+                                m->sloppy_options ? "-ns" : "-n",

                                 m->parameters_fragment.what,
                                 m->where,
                                 "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
                                 m->parameters_fragment.what,
                                 m->where,
                                 "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",


@@ -976,6 +929,7 @@ static void mount_enter_remounting(Mount *m) {
                 r = exec_command_set(
                                 m->control_command,
                                 "/bin/mount",
                 r = exec_command_set(
                                 m->control_command,
                                 "/bin/mount",

+                                m->sloppy_options ? "-ns" : "-n",

                                 m->parameters_fragment.what,
                                 m->where,
                                 "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
                                 m->parameters_fragment.what,
                                 m->where,
                                 "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",


@@ -1814,6 +1768,8 @@ const UnitVTable mount_vtable = {
 
         .get_timeout = mount_get_timeout,
 
 
         .get_timeout = mount_get_timeout,
 

+        .can_transient = true,
+

         .enumerate = mount_enumerate,
         .shutdown = mount_shutdown,
 
         .enumerate = mount_enumerate,
         .shutdown = mount_shutdown,