Skip to content

L
lxc
Commit 7faa2236 by Stéphane Graber
Options

Merge pull request #588 from sapun/master

fix container creation from ansible lxc_containers module
parents 814d049d e145bd47
Showing with 2 additions and 3 deletions
config/init/common/lxc-containers.in
...@@ -78,13 +78,13 @@ case "$1" in ...@@ -78,13 +78,13 @@ case "$1" in
if [ -n "$BOOTGROUPS" ]; then if [ -n "$BOOTGROUPS" ]; then
BOOTGROUPS="-g $BOOTGROUPS" BOOTGROUPS="-g $BOOTGROUPS"
fi fi
touch "$lockdir"/lxc
# Start containers # Start containers
wait_for_bridge wait_for_bridge
# Start autoboot containers first then the NULL group "onboot,". # Start autoboot containers first then the NULL group "onboot,".
"$bindir"/lxc-autostart $OPTIONS $BOOTGROUPS "$bindir"/lxc-autostart $OPTIONS $BOOTGROUPS
touch "$lockdir"/lxc rm -f "$lockdir"/lxc
;; ;;
stop) stop)
...@@ -96,7 +96,6 @@ case "$1" in ...@@ -96,7 +96,6 @@ case "$1" in
# delaying the system shutdown / reboot as much as we can since it's not # delaying the system shutdown / reboot as much as we can since it's not
# parallelized... Even 5 second timout may be too long. # parallelized... Even 5 second timout may be too long.
"$bindir"/lxc-autostart $STOPOPTS $SHUTDOWNDELAY "$bindir"/lxc-autostart $STOPOPTS $SHUTDOWNDELAY
rm -f "$lockdir"/lxc
;; ;;
restart|reload|force-reload) restart|reload|force-reload)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment