Merge lp:~townsend/unity8-preview-lxc/fix-wait-for-lxc-start into lp:unity8-preview-lxc/stable

[Christopher Townsend]

Add an lxc-wait after lxc-start to make sure the container is actually running before proceeding to the lxc-attach. Also, have to add an additional half second sleep to account for an lxc race where lxc-wait reports the container is running when in reality, it may not be.

[Stephen M. Webb (bregma)]

review: Approve

[lp:~townsend/unity8-preview-lxc/fix-wait-for-lxc-start]

47. By Christopher Townsend on 2015-03-05

Add a half second sleep after calling lxc-wait to avoid a race when lxc-wait sees the RUNNING state, but in reality, the container is not quite up and running.

=== modified file 'bin/unity8-lxc-compositor'
--- bin/unity8-lxc-compositor	2014-12-09 20:19:50 +0000
+++ bin/unity8-lxc-compositor	2015-03-05 14:42:28 +0000
@@ -35,7 +35,8 @@
 
 trap kill_unity_system_compositor TERM EXIT
 
-lxc-wait -t 0 -s RUNNING -n $CONTAINER_NAME || lxc-start -n $CONTAINER_NAME -d
+lxc-wait -t 0 -s RUNNING -n $CONTAINER_NAME || lxc-start -n $CONTAINER_NAME -d && \
+  lxc-wait -t 5 -s RUNNING -n $CONTAINER_NAME && sleep 0.5
 
 lxc-attach -n $CONTAINER_NAME -- /usr/sbin/unity-system-compositor.sleep $* &