X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=target.c;h=5c83dbaaf847fd022a28172e0b1e8c7f2b94ffc1;hp=b18e50fe5bdf756e49f8bee3fd657ff14f2f7fb5;hb=18149b9f57f8971ebc7d6401fc0a08a3173bcb29;hpb=a7334b0952ab66c17ee787e36e6d2c5ceb387de6

diff --git a/target.c b/target.c
index b18e50fe5..5c83dbaaf 100644
--- a/target.c
+++ b/target.c
@@ -20,6 +20,7 @@
 ***/
 
 #include <errno.h>
+#include <signal.h>
 
 #include "unit.h"
 #include "target.h"
@@ -36,16 +37,13 @@ static const char* const state_string_table[_TARGET_STATE_MAX] = {
         [TARGET_ACTIVE] = "active"
 };
 
-static int target_init(Unit *u) {
-        int r;
-        assert(u);
-
-        /* Make sure this config file actually exists */
+static void target_init(Unit *u) {
+        Target *t = TARGET(u);
 
-        if ((r = unit_load_fragment_and_dropin(u)) <= 0)
-                return r < 0 ? r : -ENOENT;
+        assert(t);
+        assert(u->meta.load_state == UNIT_STUB);
 
-        return 0;
+        t->state = 0;
 }
 
 static void target_dump(Unit *u, FILE *f, const char *prefix) {
@@ -66,7 +64,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_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]);
 }
@@ -97,10 +96,40 @@ static UnitActiveState target_active_state(Unit *u) {
         return state_translation_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 = target_init,
+        .load = unit_load_fragment_and_dropin,
 
         .dump = target_dump,