From: Alex Punco <punco@selectel.ru>
Date: Sun, 12 Jul 2015 12:52:57 +0000 (+0300)
Subject: fix container creation from ansible lxc_containers module
X-Git-Tag: lxc-1.1.3~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad6e5f6fd06a731984f6b8e2e353e70525a8183a;p=thirdparty%2Flxc.git

fix container creation from ansible lxc_containers module

Signed-off-by: Alex Punco <punco@selectel.ru>
---

diff --git a/config/init/common/lxc-containers.in b/config/init/common/lxc-containers.in
index 73ccdbac3..ebce36e3e 100644
--- a/config/init/common/lxc-containers.in
+++ b/config/init/common/lxc-containers.in
@@ -78,13 +78,13 @@ case "$1" in
         if [ -n "$BOOTGROUPS" ]; then
             BOOTGROUPS="-g $BOOTGROUPS"
         fi
-
+        touch "$lockdir"/lxc
         # Start containers
         wait_for_bridge
 
         # Start autoboot containers first then the NULL group "onboot,".
         "$bindir"/lxc-autostart $OPTIONS $BOOTGROUPS
-        touch "$lockdir"/lxc
+        rm -f "$lockdir"/lxc
     ;;
 
     stop)
@@ -96,7 +96,6 @@ case "$1" in
         # delaying the system shutdown / reboot as much as we can since it's not
         # parallelized...  Even 5 second timout may be too long.
         "$bindir"/lxc-autostart $STOPOPTS $SHUTDOWNDELAY
-        rm -f "$lockdir"/lxc
     ;;
 
     restart|reload|force-reload)