Merge pull request #8094 from smerrill/feature/avoid-docker-start-woes

Try to avoid issues when the Docker daemon restarts or stops on RHEL/CentOS 6 Upstream-commit: 3ea5a20776ce6024752cc2c5964b08aeb8ce6c7d Component: engine
2014-09-22 19:06:51 -06:00
parent 84c8b465f8 cfaf0bf98f
commit f783617844
1 changed files with 1 additions and 1 deletions
@@ -68,7 +68,7 @@ start() {

 stop() {
    echo -n $"Stopping $prog: "
-    killproc -p $pidfile $prog
+    killproc -p $pidfile -d 300 $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile