udev: tty - re-add accidentially removed hvc* match

[elogind.git] / src / unit.c

diff --git a/src/unit.c b/src/unit.c
index 450b190c0eb17ef9655ce66f3abbfcf2e8fe6499..6f10f51fbd2e2ebdacdd1cdd9b6feb52a0b23de8 100644 (file)
--- a/src/unit.c
+++ b/src/unit.c
@@ -647,6 +647,13 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
 
         condition_dump_list(u->meta.conditions, f, prefix);
 
+        if (dual_timestamp_is_set(&u->meta.condition_timestamp))
+                fprintf(f,
+                        "%s\tCondition Timestamp: %s\n"
+                        "%s\tCondition Result: %s\n",
+                        prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->meta.condition_timestamp.realtime)),
+                        prefix, yes_no(u->meta.condition_result));
+
         for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++) {
                 Unit *other;
 
@@ -825,6 +832,15 @@ fail:
         return r;
 }
 
+bool unit_condition_test(Unit *u) {
+        assert(u);
+
+        dual_timestamp_get(&u->meta.condition_timestamp);
+        u->meta.condition_result = condition_test_list(u->meta.conditions);
+
+        return u->meta.condition_result;
+}
+
 /* Errors:
  *         -EBADR:     This unit type does not support starting.
  *         -EALREADY:  Unit is already started.
@@ -849,7 +865,7 @@ int unit_start(Unit *u) {
                 return -EALREADY;
 
         /* If the conditions failed, don't do anything at all */
-        if (!condition_test_list(u->meta.conditions)) {
+        if (!unit_condition_test(u)) {
                 log_debug("Starting of %s requested but condition failed. Ignoring.", u->meta.id);
                 return -EALREADY;
         }
@@ -1208,12 +1224,6 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
                          * yet connected. */
                         bus_init(u->meta.manager, true);
 
-                if (unit_has_name(u, SPECIAL_SYSLOG_SERVICE))
-                        /* The syslog daemon just might have become
-                         * available, hence try to connect to it, if
-                         * we aren't yet connected. */
-                        log_open();
-
                 if (u->meta.type == UNIT_SERVICE &&
                     !UNIT_IS_ACTIVE_OR_RELOADING(os)) {
                         /* Write audit record if we have just finished starting up */
@@ -1226,12 +1236,6 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
 
         } else {
 
-                if (unit_has_name(u, SPECIAL_SYSLOG_SERVICE))
-                        /* The syslog daemon might just have
-                         * terminated, hence try to disconnect from
-                         * it. */
-                        log_close_syslog();
-
                 /* We don't care about D-Bus here, since we'll get an
                  * asynchronous notification for it anyway. */
 
@@ -1261,6 +1265,8 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
 
         unit_add_to_dbus_queue(u);
         unit_add_to_gc_queue(u);
+
+        manager_recheck_syslog(u->meta.manager);
 }
 
 int unit_watch_fd(Unit *u, int fd, uint32_t events, Watch *w) {
@@ -2071,6 +2077,10 @@ int unit_serialize(Unit *u, FILE *f, FDSet *fds) {
         dual_timestamp_serialize(f, "active-enter-timestamp", &u->meta.active_enter_timestamp);
         dual_timestamp_serialize(f, "active-exit-timestamp", &u->meta.active_exit_timestamp);
         dual_timestamp_serialize(f, "inactive-enter-timestamp", &u->meta.inactive_enter_timestamp);
+        dual_timestamp_serialize(f, "condition-timestamp", &u->meta.condition_timestamp);
+
+        if (dual_timestamp_is_set(&u->meta.condition_timestamp))
+                unit_serialize_item(u, f, "condition-result", yes_no(u->meta.condition_result));
 
         /* End marker */
         fputc('\n', f);
@@ -2160,6 +2170,16 @@ int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
                 } else if (streq(l, "inactive-enter-timestamp")) {
                         dual_timestamp_deserialize(v, &u->meta.inactive_enter_timestamp);
                         continue;
+                } else if (streq(l, "condition-timestamp")) {
+                        dual_timestamp_deserialize(v, &u->meta.condition_timestamp);
+                        continue;
+                } else if (streq(l, "condition-result")) {
+                        int b;
+
+                        if ((b = parse_boolean(v)) < 0)
+                                log_debug("Failed to parse condition result value %s", v);
+                        else
+                                u->meta.condition_result = b;
                 }
 
                 if ((r = UNIT_VTABLE(u)->deserialize_item(u, l, v, fds)) < 0)