systemctl: show sub state along active state

[elogind.git] / target.c

diff --git a/target.c b/target.c
index f34ba0c36df696b06642ddf608e7fe98b3f9cae6..5b897c0bfbc4aef2425473e006448467bd153024 100644 (file)
--- a/target.c
+++ b/target.c
@@ -37,6 +37,15 @@ static const char* const state_string_table[_TARGET_STATE_MAX] = {
         [TARGET_ACTIVE] = "active"
 };
 
+static void target_init(Unit *u) {
+        Target *t = TARGET(u);
+
+        assert(t);
+        assert(u->meta.load_state == UNIT_STUB);
+
+        t->state = 0;
+}
+
 static void target_dump(Unit *u, FILE *f, const char *prefix) {
         Target *t = TARGET(u);
 
@@ -52,13 +61,11 @@ static void target_set_state(Target *t, TargetState state) {
         TargetState old_state;
         assert(t);
 
-        if (state == t->state)
-                return;
-
         old_state = t->state;
         t->state = state;
 
-        log_debug("%s changed %s → %s", unit_id(UNIT(t)), state_string_table[old_state], state_string_table[state]);
+        if (state != old_state)
+                log_debug("%s changed %s → %s", unit_id(UNIT(t)), state_string_table[old_state], state_string_table[state]);
 
         unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state]);
 }
@@ -89,6 +96,12 @@ static UnitActiveState target_active_state(Unit *u) {
         return state_translation_table[TARGET(u)->state];
 }
 
+static const char *target_sub_state_to_string(Unit *u) {
+        assert(u);
+
+        return state_string_table[TARGET(u)->state];
+}
+
 int target_get_runlevel(Target *t) {
 
         static const struct {
@@ -121,12 +134,14 @@ int target_get_runlevel(Target *t) {
 const UnitVTable target_vtable = {
         .suffix = ".target",
 
-        .init = unit_load_fragment_and_dropin,
+        .init = target_init,
+        .load = unit_load_fragment_and_dropin,
 
         .dump = target_dump,
 
         .start = target_start,
         .stop = target_stop,
 
-        .active_state = target_active_state
+        .active_state = target_active_state,
+        .sub_state_to_string = target_sub_state_to_string
 };