summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Boccassi <luca.boccassi@microsoft.com>2021-12-30 00:54:32 +0000
committerYu Watanabe <watanabe.yu+github@gmail.com>2021-12-30 23:50:45 +0900
commit466f2351bbb5c0fdc9f153e35506570e59b14c5f (patch)
tree516bab0b4051a449db9003ff7d31df4dbbde02e3
parent86980de64bf8c03505eec729808f52f3b3042998 (diff)
downloadsystemd-466f2351bbb5c0fdc9f153e35506570e59b14c5f.tar.gz
systemd-run: ensure error logs suggest to use '--user' when appropriate
Before: $ systemd-run --service-type=notify --user false Job for run-rc3fe52ee6ddd4a6eaaf1a20e0a949cdf.service failed because the control process exited with error code. See "systemctl status run-rc3fe52ee6ddd4a6eaaf1a20e0a949cdf.service" and "journalctl -xeu run-rc3fe52ee6ddd4a6eaaf1a20e0a949cdf.service" for details. After: $ systemd-run --service-type=notify --user false Job for run-r7791e380a7b6400ea01d6a0e5a458b23.service failed because the control process exited with error code. See "systemctl --user status run-r7791e380a7b6400ea01d6a0e5a458b23.service" and "journalctl --user -xeu run-r7791e380a7b6400ea01d6a0e5a458b23.service" for details. Fixes https://github.com/systemd/systemd/issues/21933
-rw-r--r--src/run/run.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/run/run.c b/src/run/run.c
index 92c19b6a32..ff24373847 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -1229,7 +1229,7 @@ static int start_transient_service(
if (r < 0)
return bus_log_parse_error(r);
- r = bus_wait_for_jobs_one(w, object, arg_quiet, NULL);
+ r = bus_wait_for_jobs_one(w, object, arg_quiet, arg_user ? STRV_MAKE_CONST("--user") : NULL);
if (r < 0)
return r;
}
@@ -1465,7 +1465,7 @@ static int start_transient_scope(sd_bus *bus) {
if (r < 0)
return bus_log_parse_error(r);
- r = bus_wait_for_jobs_one(w, object, arg_quiet, NULL);
+ r = bus_wait_for_jobs_one(w, object, arg_quiet, arg_user ? STRV_MAKE_CONST("--user") : NULL);
if (r < 0)
return r;
@@ -1685,7 +1685,7 @@ static int start_transient_trigger(
if (r < 0)
return bus_log_parse_error(r);
- r = bus_wait_for_jobs_one(w, object, arg_quiet, NULL);
+ r = bus_wait_for_jobs_one(w, object, arg_quiet, arg_user ? STRV_MAKE_CONST("--user") : NULL);
if (r < 0)
return r;