X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fpath.c;h=f4c20940d07842f7dce19aeaf02b621feeaa5e10;hp=80dc3c44d08f42fa3ff7494aad4c5b3bf333dbd1;hb=5632e3743db350a67478acc107d76cdf648a1f99;hpb=032ff4afc953cae076ce0ee6a0b85020eeb1a75a

diff --git a/src/path.c b/src/path.c
index 80dc3c44d..f4c20940d 100644
--- a/src/path.c
+++ b/src/path.c
@@ -29,6 +29,8 @@
 #include "unit-name.h"
 #include "path.h"
 #include "dbus-path.h"
+#include "special.h"
+#include "bus-errors.h"
 
 static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
         [PATH_DEAD] = UNIT_INACTIVE,
@@ -65,10 +67,7 @@ int path_add_one_mount_link(Path *p, Mount *m) {
                 if (!path_startswith(s->path, m->where))
                         continue;
 
-                if ((r = unit_add_dependency(UNIT(m), UNIT_BEFORE, UNIT(p), true)) < 0)
-                        return r;
-
-                if ((r = unit_add_dependency(UNIT(p), UNIT_REQUIRES, UNIT(m), true)) < 0)
+                if ((r = unit_add_two_dependencies(UNIT(p), UNIT_AFTER, UNIT_REQUIRES, UNIT(m), true)) < 0)
                         return r;
         }
 
@@ -102,6 +101,18 @@ static int path_verify(Path *p) {
         return 0;
 }
 
+static int path_add_default_dependencies(Path *p) {
+        int r;
+
+        assert(p);
+
+        if (p->meta.manager->running_as == MANAGER_SYSTEM)
+                if ((r = unit_add_two_dependencies_by_name(UNIT(p), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
+                        return r;
+
+        return unit_add_two_dependencies_by_name(UNIT(p), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
+}
+
 static int path_load(Unit *u) {
         Path *p = PATH(u);
         int r;
@@ -123,6 +134,10 @@ static int path_load(Unit *u) {
 
                 if ((r = path_add_mount_links(p)) < 0)
                         return r;
+
+                if (p->meta.default_dependencies)
+                        if ((r = path_add_default_dependencies(p)) < 0)
+                                return r;
         }
 
         return path_verify(p);
@@ -295,17 +310,26 @@ static void path_enter_dead(Path *p, bool success) {
 
 static void path_enter_running(Path *p) {
         int r;
+        DBusError error;
+
         assert(p);
+        dbus_error_init(&error);
 
-        if ((r = manager_add_job(p->meta.manager, JOB_START, p->unit, JOB_REPLACE, true, NULL)) < 0)
+        /* Don't start job if we are supposed to go down */
+        if (p->meta.job && p->meta.job->type == JOB_STOP)
+                return;
+
+        if ((r = manager_add_job(p->meta.manager, JOB_START, p->unit, JOB_REPLACE, true, &error, NULL)) < 0)
                 goto fail;
 
         path_set_state(p, PATH_RUNNING);
         return;
 
 fail:
-        log_warning("%s failed to queue unit startup job: %s", p->meta.id, strerror(-r));
+        log_warning("%s failed to queue unit startup job: %s", p->meta.id, bus_error(&error, r));
         path_enter_dead(p, false);
+
+        dbus_error_free(&error);
 }
 
 
@@ -536,6 +560,17 @@ fail:
         log_error("Failed find path unit: %s", strerror(-r));
 }
 
+static void path_reset_maintenance(Unit *u) {
+        Path *p = PATH(u);
+
+        assert(p);
+
+        if (p->state == PATH_MAINTENANCE)
+                path_set_state(p, PATH_DEAD);
+
+        p->failure = false;
+}
+
 static const char* const path_state_table[_PATH_STATE_MAX] = {
         [PATH_DEAD] = "dead",
         [PATH_WAITING] = "waiting",
@@ -574,5 +609,7 @@ const UnitVTable path_vtable = {
 
         .fd_event = path_fd_event,
 
+        .reset_maintenance = path_reset_maintenance,
+
         .bus_message_handler = bus_path_message_handler
 };