summaryrefslogtreecommitdiff
path: root/src/timer.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-03 19:48:33 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-03 19:48:33 +0200
commita40eb73224e237f758d38847ae216c019425ebac (patch)
treedc95aa3e1800bb44f43393341acb469863483036 /src/timer.c
parent2c966c038dc32ef39baa176371395cde4e541d01 (diff)
unit: add DefaultDependencies= setting
In order to simplify writing of unit files introduce default dependencies that are added to all units unless explictly disabled in a unit. This option can be switched off for select units that are involved in early boot-up ot late system shutdown, This should simplify service files for most normal daemons, but breaks existing service files for software involved in early boot (notably udev), which need to be updated for a DefaultDependencies=no setting)
Diffstat (limited to 'src/timer.c')
-rw-r--r--src/timer.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/timer.c b/src/timer.c
index f0005f55ce..e3c916bb0f 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -25,6 +25,7 @@
#include "unit-name.h"
#include "timer.h"
#include "dbus-timer.h"
+#include "special.h"
static const UnitActiveState state_translation_table[_TIMER_STATE_MAX] = {
[TIMER_DEAD] = UNIT_INACTIVE,
@@ -89,6 +90,11 @@ static int timer_load(Unit *u) {
if ((r = unit_add_dependency(u, UNIT_BEFORE, t->unit, true)) < 0)
return r;
+
+ /* Timers shouldn't stay around on shutdown */
+ if (t->meta.default_dependencies)
+ if ((r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true)) < 0)
+ return r;
}
return timer_verify(t);