chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
automount: implement automount unit type
[elogind.git]
/
target.c
diff --git
a/target.c
b/target.c
index 5c83dbaaf847fd022a28172e0b1e8c7f2b94ffc1..176ab68c42f4d5f7ce2a601c3dffcd867f3d0028 100644
(file)
--- a/
target.c
+++ b/
target.c
@@
-37,15
+37,6
@@
static const char* const state_string_table[_TARGET_STATE_MAX] = {
[TARGET_ACTIVE] = "active"
};
[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);
static void target_dump(Unit *u, FILE *f, const char *prefix) {
Target *t = TARGET(u);
@@
-65,7
+56,7
@@
static void target_set_state(Target *t, TargetState state) {
t->state = state;
if (state != old_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]);
}
unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state]);
}
@@
-96,6
+87,12
@@
static UnitActiveState target_active_state(Unit *u) {
return state_translation_table[TARGET(u)->state];
}
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 {
int target_get_runlevel(Target *t) {
static const struct {
@@
-128,7
+125,6
@@
int target_get_runlevel(Target *t) {
const UnitVTable target_vtable = {
.suffix = ".target",
const UnitVTable target_vtable = {
.suffix = ".target",
- .init = target_init,
.load = unit_load_fragment_and_dropin,
.dump = target_dump,
.load = unit_load_fragment_and_dropin,
.dump = target_dump,
@@
-136,5
+132,6
@@
const UnitVTable target_vtable = {
.start = target_start,
.stop = target_stop,
.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
};
};