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

diff --git a/debian/changelog b/debian/changelog
index ac8ee35fe4a0c23390363afb99017aec36052524..1f982f023c3f2c7cfbcc49e4d45585059e2fbdd2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
 
  --
 

diff --git a/debian/init-functions b/debian/init-functions
index 0c1d599d9e4735aa991e499c33f0821d68899275..ab8a04fef16a85cd1a78c15b717402183eed3cf1 100644 (file)
--- a/debian/init-functions
+++ b/debian/init-functions
@@ -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