File 0002-lxc-autostart-helper-working-even-if-actio... of Package lxc

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-lxc-autostart-helper-working-even-if-action-is-not-a.patch of Package lxc (Revision 8eea6ec310a88149c2f279ec1a877c02)

Currently displaying revision 8eea6ec310a88149c2f279ec1a877c02 , Show latest

From 968ae01f39622aad693e3d3b4c91bf69cdcab0b8 Mon Sep 17 00:00:00 2001
From: Johannes Kastl <git@ojkastl.de>
Date: Fri, 15 Aug 2014 15:01:01 +0200
Subject: [PATCH 2/2] lxc-autostart-helper working even if action is not
 available

Signed-off-by: Johannes Kastl <git@ojkastl.de>
---
 config/init/sysvinit/lxc.in | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/config/init/sysvinit/lxc.in b/config/init/sysvinit/lxc.in
index c4c0c75..9697ff4 100644
--- a/config/init/sysvinit/lxc.in
+++ b/config/init/sysvinit/lxc.in
@@ -47,9 +47,7 @@ test ! -r "$sysconfdir"/rc.d/init.d/functions ||
 
 # provide action() fallback
 if ! type action >/dev/null 2>&1; then
-    action() {
-        echo "$@"
-    }
+    ACTION_NOT_AVAILABLE="yes"
 fi
 
 # Source any configurable options
@@ -105,7 +103,13 @@ case "$1" in
 	# Start containers
 	wait_for_bridge
 	# Start autoboot containers first then the NULL group "onboot,".
-	action $"Starting LXC autoboot containers: " /usr/bin/lxc-autostart $OPTIONS $BOOTGROUPS
+	if [ ${ACTION_NOT_AVAILABLE} == "yes" ]
+	then
+	    echo "Starting LXC autoboot containers: "
+	    /usr/bin/lxc-autostart $OPTIONS $BOOTGROUPS
+	else
+	    action $"Starting LXC autoboot containers: " /usr/bin/lxc-autostart $OPTIONS $BOOTGROUPS
+	fi
 	touch "$localstatedir"/lock/subsys/lxc
 	;;
   stop)
@@ -117,7 +121,13 @@ case "$1" in
 	# The stop is serialized and can take excessive time.  We need to avoid
 	# delaying the system shutdown / reboot as much as we can since it's not
 	# parallelized...  Even 5 second timout may be too long.
-	action $"Stopping LXC containers: " "$bindir"/lxc-autostart $STOPOPTS $SHUTDOWNDELAY
+	if [ ${ACTION_NOT_AVAILABLE} == "yes" ]
+	then
+	    echo "Stopping LXC containers: "
+	    "$bindir"/lxc-autostart $STOPOPTS $SHUTDOWNDELAY
+	else
+	    action $"Stopping LXC containers: " "$bindir"/lxc-autostart $STOPOPTS $SHUTDOWNDELAY
+	fi
 	rm -f "$localstatedir"/lock/subsys/lxc
 	;;
   restart|reload|force-reload)
-- 
2.0.4

Places

File 0002-lxc-autostart-helper-working-even-if-action-is-not-a.patch of Package lxc (Revision 8eea6ec310a88149c2f279ec1a877c02)

Places