cgroup: only delete empty cgroups

[elogind.git] / target.c

diff --git a/target.c b/target.c
index 5b897c0bfbc4aef2425473e006448467bd153024..61cbebf654bc900b8340b6e24db4ca4f67b067e8 100644 (file)
--- 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,
@@ -37,15 +38,6 @@ 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);
 
@@ -65,7 +57,7 @@ static void target_set_state(Target *t, TargetState state) {
         t->state = state;
 
         if (state != old_state)
-                log_debug("%s changed %s → %s", unit_id(UNIT(t)), state_string_table[old_state], state_string_table[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]);
 }
@@ -134,7 +126,6 @@ int target_get_runlevel(Target *t) {
 const UnitVTable target_vtable = {
         .suffix = ".target",
 
-        .init = target_init,
         .load = unit_load_fragment_and_dropin,
 
         .dump = target_dump,
@@ -143,5 +134,7 @@ const UnitVTable target_vtable = {
         .stop = target_stop,
 
         .active_state = target_active_state,
-        .sub_state_to_string = target_sub_state_to_string
+        .sub_state_to_string = target_sub_state_to_string,
+
+        .bus_message_handler = bus_target_message_handler
 };