summaryrefslogtreecommitdiff
path: root/unit.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-04-13 02:06:27 +0200
committerLennart Poettering <lennart@poettering.net>2010-04-13 02:06:27 +0200
commit80876c20f64f87765242bc35895977ab6a855729 (patch)
treefdb82b57685c706f99fde5659d350b1d3b381eda /unit.c
parent4112df163517478207526e0d3e7278ab1acf1f9f (diff)
rework tty handling
We now make sure to run all services in their own session, possibly with a controlling terminal. This also extends the service and socket state machines a little.
Diffstat (limited to 'unit.c')
-rw-r--r--unit.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/unit.c b/unit.c
index d1416e03e9..7d570056b4 100644
--- a/unit.c
+++ b/unit.c
@@ -471,7 +471,7 @@ int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
assert(u);
assert(c);
- if (c->output != EXEC_OUTPUT_KERNEL && c->output != EXEC_OUTPUT_SYSLOG)
+ if (c->std_output != EXEC_OUTPUT_KERNEL && c->std_output != EXEC_OUTPUT_SYSLOG)
return 0;
/* If syslog or kernel logging is requested, make sure our own
@@ -1520,9 +1520,10 @@ static const char* const unit_dependency_table[_UNIT_DEPENDENCY_MAX] = {
DEFINE_STRING_TABLE_LOOKUP(unit_dependency, UnitDependency);
static const char* const kill_mode_table[_KILL_MODE_MAX] = {
- [KILL_PROCESS] = "process",
+ [KILL_CONTROL_GROUP] = "control-group",
[KILL_PROCESS_GROUP] = "process-group",
- [KILL_CONTROL_GROUP] = "control-group"
+ [KILL_PROCESS] = "process",
+ [KILL_NONE] = "none"
};
DEFINE_STRING_TABLE_LOOKUP(kill_mode, KillMode);