diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-12-24 00:35:58 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-02-03 11:51:57 +0100 |
| commit | 95f1d6bfecde60b245fae1ab0313b550201e7880 (patch) | |
| tree | ff2dd416a0a3aca340ecb7af786ba3d3734f487d /src/shared/ptyfwd.h | |
| parent | 9182fb52acc5993a86b83c2fe4216a542cecf226 (diff) | |
run: exit early in --pty if service failed
This reworks systemd-run so that in --pty mode we watch the unit state
the way we do it in --wait mode. Whenever we notice that the service is
in failed or inactive state finish right-away, but first write all
unwritten characters we can read from the master TTY device.
This makes sure that when the TTY service fails before it opens the
slave PTY device we properly notice that and exit early, so that borked
start parameters result in immediate systemd-run failure. Previously,
we'd not notice this at all, as a PTY slave that never was opened won't
result in POLLHUP events, and we'd hence simply keep reading from it
forever.
In essence, --pty now enables the same unit watching logic that --wait
enables. However, unless --wait is specified we won#t show the final
summary, hence the effective difference should be pretty minimal.
Fixes: #3915
Diffstat (limited to 'src/shared/ptyfwd.h')
| -rw-r--r-- | src/shared/ptyfwd.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/shared/ptyfwd.h b/src/shared/ptyfwd.h index bd5d5fec0d..3fad1d3b26 100644 --- a/src/shared/ptyfwd.h +++ b/src/shared/ptyfwd.h @@ -51,4 +51,6 @@ bool pty_forward_is_done(PTYForward *f); void pty_forward_set_handler(PTYForward *f, PTYForwardHandler handler, void *userdata); +bool pty_forward_drain(PTYForward *f); + DEFINE_TRIVIAL_CLEANUP_FUNC(PTYForward*, pty_forward_free); |