Prechádzať zdrojové kódy

Merge pull request #5844 from stpierre/init-script-wait-for-pidfile

Wait for pidfile to exist when starting with RedHat init script
Tianon Gravi 11 rokov pred
rodič
commit
47aa9f5a0e
1 zmenil súbory, kde vykonal 8 pridanie a 1 odobranie
  1. 8 1
      contrib/init/sysvinit-redhat/docker

+ 8 - 1
contrib/init/sysvinit-redhat/docker

@@ -3,7 +3,7 @@
 #       /etc/rc.d/init.d/docker
 #
 #       Daemon for docker.io
-#       
+#
 # chkconfig:   2345 95 95
 # description: Daemon for docker.io
 
@@ -49,6 +49,13 @@ start() {
         $exec -d $other_args &>> $logfile &
         pid=$!
         touch $lockfile
+        # wait up to 10 seconds for the pidfile to exist.  see
+        # https://github.com/dotcloud/docker/issues/5359
+        tries=0
+        while [ ! -f $pidfile -a $tries -lt 10 ]; do
+            sleep 1
+            tries=$((tries + 1))
+        done
         success
         echo
     else