morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

run: when disconnected from PTY forwarder, exit event loop if not --wait

Browse Source 
Follow-up for ade0789fab

The change in behavior was partly intentional, as I think
if both --wait and --pty are used, manually disconnecting
from PTY forwarder should not result in systemd-run exiting
with "Finished with ..." log. But we should check for
--wait here.

Closes #32953
This commit is contained in:
Mike Yuan
2024-05-21 20:10:24 +08:00
parent d735753256
commit 2b4a691c32
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/run/run.c
View File

@@ -1432,7 +1432,7 @@ static void run_context_check_done(RunContext *c) {
else
done = true;
if (c->forward && done) /* If the service is gone, it's time to drain the output */
if (c->forward && !pty_forward_is_done(c->forward) && done) /* If the service is gone, it's time to drain the output */
done = pty_forward_drain(c->forward);
if (done)
@@ -1506,9 +1506,14 @@ static int pty_forward_handler(PTYForward *f, int rcode, void *userdata) {
assert(f);
if (rcode == -ECANCELED)
if (rcode == -ECANCELED) {
log_debug_errno(rcode, "PTY forwarder disconnected.");
else if (rcode < 0) {
if (!arg_wait)
return sd_event_exit(c->event, EXIT_SUCCESS);
/* If --wait is specified, we'll only exit the pty forwarding, but will continue to wait
* for the service to end. If the user hits ^C we'll exit too. */
} else if (rcode < 0) {
sd_event_exit(c->event, EXIT_FAILURE);
return log_error_errno(rcode, "Error on PTY forwarding logic: %m");
}