Commit 1913a3fb authored by Tollef Fog Heen's avatar Tollef Fog Heen
Browse files

Skip masked services in lsb-base-logging.sh

Silently skip masked services in lsb-base-logging.sh instead of
failing.  Initial implementation by Michael Biebl.  Closes: #612551
parent 815484f4
......@@ -3,6 +3,8 @@ systemd (17-1) UNRELEASED; urgency=low
[ Tollef Fog Heen ]
* New upstream release
* Clarify ifupdown instructions in README.Debian somewhat.
* Silently skip masked services in lsb-base-logging.sh instead of
failing. Initial implementation by Michael Biebl. Closes: #612551
[ Michael Biebl ]
* Bump build dependency on valac to (>= 0.10.3).
......
......@@ -55,6 +55,13 @@ systemctl_redirect () {
esac
service="${prog%.sh}.service"
# Don't try to run masked services. Don't check for errors, if
# this errors, we'll just call systemctl and possibly explode
# there.
state=$(systemctl -p LoadState show $service 2>/dev/null)
[ "$state" = "LoadState=masked" ] && return 0
[ "$command" = status ] || log_daemon_msg "$s" "$service"
/bin/systemctl $command "$service"
rc=$?
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment