chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use linux/sched.h instead of sched.h for older glibc
[elogind.git]
/
target.c
diff --git
a/target.c
b/target.c
index 6c84908e9b605730e69f0c3db7ffc1bdbf7b4e1a..03f092e35c112fe8afa81245c272632b4df31b50 100644
(file)
--- a/
target.c
+++ b/
target.c
@@
-1,5
+1,7
@@
/*-*- Mode: C; c-basic-offset: 8 -*-*/
/*-*- Mode: C; c-basic-offset: 8 -*-*/
+#include <errno.h>
+
#include "unit.h"
#include "target.h"
#include "load-fragment.h"
#include "unit.h"
#include "target.h"
#include "load-fragment.h"
@@
-15,6
+17,18
@@
static const char* const state_string_table[_TARGET_STATE_MAX] = {
[TARGET_ACTIVE] = "active"
};
[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);
static void target_dump(Unit *u, FILE *f, const char *prefix) {
Target *t = TARGET(u);
@@
-33,7
+47,7
@@
static void target_set_state(Target *t, TargetState state) {
old_state = t->state;
t->state = state;
old_state = t->state;
t->state = state;
- log_debug("%s chang
ing
%s → %s", unit_id(UNIT(t)), state_string_table[old_state], state_string_table[state]);
+ log_debug("%s chang
ed
%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]);
}
unit_notify(UNIT(t), state_translation_table[old_state], state_translation_table[state]);
}
@@
-67,7
+81,7
@@
static UnitActiveState target_active_state(Unit *u) {
const UnitVTable target_vtable = {
.suffix = ".target",
const UnitVTable target_vtable = {
.suffix = ".target",
- .init =
unit_load_fragment_and_dropin
,
+ .init =
target_init
,
.dump = target_dump,
.dump = target_dump,