From: Tollef Fog Heen <tfheen@err.no>
Date: Wed, 27 Apr 2011 19:59:11 +0000 (+0200)
Subject: Remove "local" in non-function context in init-functions wrapper.
X-Git-Tag: 25-2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12b3a6d71112fe3147490f1b6dd15e8a4e0045b7;p=systemd

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

diff --git a/debian/changelog b/debian/changelog
index ac8ee35f..1f982f02 100644
--- 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 0c1d599d..ab8a04fe 100644
--- 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