X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=target.c;h=61cbebf654bc900b8340b6e24db4ca4f67b067e8;hb=c9106f61d0755dc6b8aa7c4252baa140c2d473f1;hp=b8a7442f1c44b39100bf8f0678ab42c2a3c29d7e;hpb=23a177ef7c8c38c238ef06666f900f581b48298f;p=elogind.git

diff --git a/target.c b/target.c
index b8a7442f1..61cbebf65 100644
--- a/target.c
+++ b/target.c
@@ -26,6 +26,7 @@
 #include "target.h"
 #include "load-fragment.h"
 #include "log.h"
+#include "dbus-target.h"
 
 static const UnitActiveState state_translation_table[_TARGET_STATE_MAX] = {
         [TARGET_DEAD] = UNIT_INACTIVE,
@@ -55,7 +56,8 @@ static void target_set_state(Target *t, TargetState state) {
         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(t)->meta.id, state_string_table[old_state], state_string_table[state]);
 
         unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state]);
 }
@@ -86,15 +88,53 @@ 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 {
+                const char *special;
+                const int runlevel;
+        } table[] = {
+                { SPECIAL_RUNLEVEL5_TARGET, '5' },
+                { SPECIAL_RUNLEVEL4_TARGET, '4' },
+                { SPECIAL_RUNLEVEL3_TARGET, '3' },
+                { SPECIAL_RUNLEVEL2_TARGET, '2' },
+                { SPECIAL_RUNLEVEL1_TARGET, '1' },
+                { SPECIAL_RUNLEVEL0_TARGET, '0' },
+                { SPECIAL_RUNLEVEL6_TARGET, '6' },
+        };
+
+        unsigned i;
+
+        assert(t);
+
+        /* Tries to determine if this is a SysV runlevel and returns
+         * it if that is so. */
+
+        for (i = 0; i < ELEMENTSOF(table); i++)
+                if (unit_has_name(UNIT(t), table[i].special))
+                        return table[i].runlevel;
+
+        return 0;
+}
+
 const UnitVTable target_vtable = {
         .suffix = ".target",
 
-        .init = unit_load_fragment_and_dropin,
+        .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,
+
+        .bus_message_handler = bus_target_message_handler
 };