X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=target.c;h=c80c09d546b62a46bb97bcb3d65a99a850971443;hb=70123e68a04016efca9266fc22dd05a0a7fd2d51;hp=03f092e35c112fe8afa81245c272632b4df31b50;hpb=d46de8a1a249e179687361dcaeba27e1c586253a;p=elogind.git
diff --git a/target.c b/target.c
index 03f092e35..c80c09d54 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 .
+***/
+
#include
+#include
#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);
@@ -44,6 +52,9 @@ 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;
@@ -81,7 +92,7 @@ static UnitActiveState target_active_state(Unit *u) {
const UnitVTable target_vtable = {
.suffix = ".target",
- .init = target_init,
+ .init = unit_load_fragment_and_dropin,
.dump = target_dump,