SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

run: trivial followups (#36765)

Browse Source
This commit is contained in:
Yu Watanabe
2025-03-17 12:27:49 +09:00
committed by GitHub
parent 369c232538 2fb10b3cfb
commit db2db8cc60
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/run/run.c
+6 -2
View File
@@ -764,7 +764,7 @@ static int parse_argv(int argc, char *argv[]) {
if (arg_stdio != ARG_STDIO_NONE) {
if (with_trigger || arg_scope)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"--pty/--pty-late/--pipe is not compatible in timer or --scope mode.");
"--pty/--pty-late/--pipe is not compatible in trigger (path/socket/timer units) or --scope mode.");
if (arg_transport == BUS_TRANSPORT_REMOTE)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
@@ -775,6 +775,10 @@ static int parse_argv(int argc, char *argv[]) {
"--pty/--pty-late/--pipe is not compatible with --no-block.");
}
if (arg_stdio == ARG_STDIO_PTY && arg_pty_late && streq_ptr(arg_service_type, "oneshot"))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"--pty-late is not compatible with --service-type=oneshot.");
if (arg_scope && with_trigger)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Path, socket or timer options are not supported in --scope mode.");
@@ -1679,7 +1683,7 @@ static int run_context_check_started(RunContext *c) {
/* Setup ptyfwd now if --pty-late is specified. */
r = run_context_setup_ptyfwd(c);
if (r < 0) {
sd_event_exit(c->event, EXIT_FAILURE);
(void) sd_event_exit(c->event, EXIT_FAILURE);
return r;
}