X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=target.c;h=176ab68c42f4d5f7ce2a601c3dffcd867f3d0028;hb=6dde1f33e1249a8a6b354372dd95065f26b8c712;hp=03f092e35c112fe8afa81245c272632b4df31b50;hpb=d46de8a1a249e179687361dcaeba27e1c586253a;p=elogind.git

diff --git a/target.c b/target.c
index 03f092e35..176ab68c4 100644
--- a/target.c
+++ b/target.c
@@ -1,6 +1,26 @@
 /*-*- Mode: C; c-basic-offset: 8 -*-*/
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
 #include <errno.h>
+#include <signal.h>
 
 #include "unit.h"
 #include "target.h"
@@ -17,18 +37,6 @@ 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 */
-
-        if ((r = unit_load_fragment_and_dropin(u)) <= 0)
-                return r < 0 ? r : -ENOENT;
-
-        return 0;
-}
-
 static void target_dump(Unit *u, FILE *f, const char *prefix) {
         Target *t = TARGET(u);
 
@@ -47,7 +55,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]);
 }
@@ -78,15 +87,51 @@ 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 = 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
 };