X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=target.c;h=176ab68c42f4d5f7ce2a601c3dffcd867f3d0028;hb=6dde1f33e1249a8a6b354372dd95065f26b8c712;hp=f34ba0c36df696b06642ddf608e7fe98b3f9cae6;hpb=e293f0f07d0dcff74acf756a2b88d7bd949257a7;p=elogind.git diff --git a/target.c b/target.c index f34ba0c36..176ab68c4 100644 --- a/target.c +++ b/target.c @@ -52,13 +52,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(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]); } @@ -89,6 +87,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 +125,13 @@ int target_get_runlevel(Target *t) { 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 };