Commit 12b3a6d7 authored by Tollef Fog Heen's avatar Tollef Fog Heen
Browse files

Remove "local" in non-function context in init-functions wrapper.

parent 12e1abde
......@@ -4,6 +4,7 @@ systemd (25-2) experimental; urgency=low
/lib/lsb/init-functions on downgrades to << 25-1.
* Cherry-pick a133bf10d09f788079b82f63faa7058a27ba310b from upstream,
avoids assert when dumping properties. Closes: #624094
* Remove "local" in non-function context in init-functions wrapper.
--
......
......@@ -26,9 +26,9 @@ if [ -e /sys/fs/cgroup/systemd ] ; then
_use_systemctl=1
fi
# Redirect if there's a matching .service file in /etc or /lib
local prog=${0##*/}
local service="${prog%.sh}.service"
local fp=$(systemctl -p FragmentPath show $service 2>/dev/null | sed 's/^FragmentPath=//')
prog=${0##*/}
service="${prog%.sh}.service"
fp=$(systemctl -p FragmentPath show $service 2>/dev/null | sed 's/^FragmentPath=//')
case "$fp" in
/lib/systemd/system/*|/etc/systemd/system/*)
_use_systemctl=1
......
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