Merge pull request #11945 from lmars/fix-upstart-post-start

Prevent Upstart post-start stanza from hanging Upstream-commit: 485071f92e9fd804f009e416ab529312304713c5 Component: engine
2015-04-14 16:23:04 -07:00
parent 0d57506a8e e5cca0d2d7
commit 3ed5aa62d9
1 changed files with 1 additions and 1 deletions
@@ -49,7 +49,7 @@ post-start script
 	fi
 	if ! printf "%s" "$DOCKER_OPTS" | grep -qE -e '-H|--host'; then
 		while ! [ -e /var/run/docker.sock ]; do
-			initctl status $UPSTART_JOB | grep -q "stop/" && exit 1
+			initctl status $UPSTART_JOB | grep -qE "(stop|respawn)/" && exit 1
 			echo "Waiting for /var/run/docker.sock"
 			sleep 0.1
 		done