Skip to content
Snippets Groups Projects
Commit e5a9bd57 authored by Simon McVittie's avatar Simon McVittie
Browse files

check-dbus-services: pass machine-readability options to systemctl


Otherwise, when running check-dbus-services manually, it will
launch a pager.

Reviewed-by: default avatarSjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: default avatarSimon McVittie <simon.mcvittie@collabora.co.uk>
Differential Revision: https://phabricator.apertis.org/D3903
parent f52847c8
No related branches found
No related tags found
No related merge requests found
......@@ -90,11 +90,13 @@ else
systemd_dir="/usr/lib/systemd/$systemd"
fi
systemctl="systemctl --full --no-ask-password --no-pager --$systemd"
cd "/usr/share/dbus-1/$dir"
# Make sure systemd and dbus-daemon are up to date with any recently-installed
# services or configuration
run_verbose systemctl --$systemd daemon-reload
run_verbose $systemctl daemon-reload
run_verbose gdbus call --$bus -d org.freedesktop.DBus -o /org/freedesktop/dbus \
-m org.freedesktop.DBus.ReloadConfig
......@@ -165,7 +167,7 @@ for service in *.service; do
# The exit code from this does not necessarily tell us anything about it;
# it will be nonzero if an on-demand service has exited.
if [ -n "$systemd_service" ]; then
run_verbose systemctl -l --$systemd status "$systemd_service" || true
run_verbose $systemctl status "$systemd_service" || true
fi
if [ "$failed" = 0 ] && [ "$xfailed" = 0 ] && [ "$skipped" = 0 ]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment