X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fpath.c;h=42c64f3eb1aaf5bd06d2d195f0da50a908f68c5b;hp=56936fd673fd76d427c18eb8fdce7f2105279be5;hb=6309077509a8221b1b298ba9dd05143908f9939c;hpb=2c966c038dc32ef39baa176371395cde4e541d01

diff --git a/src/path.c b/src/path.c
index 56936fd67..42c64f3eb 100644
--- a/src/path.c
+++ b/src/path.c
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 /***
   This file is part of systemd.
@@ -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,
@@ -99,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_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true);
+}
+
 static int path_load(Unit *u) {
         Path *p = PATH(u);
         int r;
@@ -120,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);
@@ -127,12 +145,10 @@ static int path_load(Unit *u) {
 
 static void path_dump(Unit *u, FILE *f, const char *prefix) {
         Path *p = PATH(u);
-        const char *prefix2;
-        char *p2;
         PathSpec *s;
 
-        p2 = strappend(prefix, "\t");
-        prefix2 = p2 ? p2 : prefix;
+        assert(p);
+        assert(f);
 
         fprintf(f,
                 "%sPath State: %s\n"
@@ -146,8 +162,6 @@ static void path_dump(Unit *u, FILE *f, const char *prefix) {
                         prefix,
                         path_type_to_string(s->type),
                         s->path);
-
-        free(p2);
 }
 
 static void path_unwatch_one(Path *p, PathSpec *s) {
@@ -292,17 +306,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);
+
+        /* 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, NULL)) < 0)
+        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);
 }
 
 
@@ -533,6 +556,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",
@@ -571,5 +605,8 @@ const UnitVTable path_vtable = {
 
         .fd_event = path_fd_event,
 
+        .reset_maintenance = path_reset_maintenance,
+
+        .bus_interface = "org.freedesktop.systemd1.Path",
         .bus_message_handler = bus_path_message_handler
 };