diff options
author | Lennart Poettering <lennart@poettering.net> | 2012-06-26 12:16:18 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2012-06-26 12:21:43 +0200 |
commit | af6da548aa14c57da7f17b3a1f2211efdb811d19 (patch) | |
tree | e118258cb9795ee0b80b656c9aca121cf7bc8b3e /src/core/manager.c | |
parent | 0c7f15b3a95c3596a4756de5c44eb1fdcd0034fc (diff) |
core: make systemd.confirm_spawn=1 actually work
This adds a timeout if the TTY cannot be acquired and makes sure we
always output the question to the console, never to the TTY of the
respective service.
Diffstat (limited to 'src/core/manager.c')
-rw-r--r-- | src/core/manager.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index dedcb74be6..9dfcb98de9 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -2005,6 +2005,9 @@ void manager_check_finished(Manager *m) { /* Notify Type=idle units that we are done now */ close_pipe(m->idle_pipe); + /* Turn off confirm spawn now */ + m->confirm_spawn = false; + if (dual_timestamp_is_set(&m->finish_timestamp)) return; |