From: Martin Pitt <martin.pitt@ubuntu.com>
Date: Thu, 31 Jul 2014 06:53:54 +0000 (+0200)
Subject: systemd: Ensure action() is defined
X-Git-Tag: lxc-1.1.0.alpha2~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84b3775a090a3e67514eb5f46d32eabb39fcc068;p=thirdparty%2Flxc.git

systemd: Ensure action() is defined

If /etc/rc.d/init.d/functions is not present or does not define an action()
function, provide a simple fallback using "echo".

Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/config/init/sysvinit/lxc.in b/config/init/sysvinit/lxc.in
index a8503410e..7cad8c8e4 100644
--- a/config/init/sysvinit/lxc.in
+++ b/config/init/sysvinit/lxc.in
@@ -45,6 +45,13 @@ STOPOPTS="-a -A -s"
 test ! -r "$sysconfdir"/rc.d/init.d/functions ||
         . "$sysconfdir"/rc.d/init.d/functions
 
+# provide action() fallback
+if ! type action >/dev/null 2>&1; then
+    action() {
+        echo "$@"
+    }
+fi
+
 # Source any configurable options
 test ! -r "$sysconfdir"/sysconfig/lxc ||
         . "$sysconfdir"/sysconfig/lxc