Revise scripts for Docker

ailispaw · Oct 30, 2015 · 44c01ae · 44c01ae
1 parent 4f2c63f
commit 44c01ae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/overlay/etc/init.d/docker b/overlay/etc/init.d/docker
@@ -44,9 +44,9 @@ start() {
   logger -s -p user.info -t "docker[$$]" "Starting Docker daemon $DOCKER_PARAMS"
   echo "Starting Docker daemon $DOCKER_PARAMS" >> "$DOCKER_LOGFILE"
   if [ "$$" == "1" ]; then
-    eval "exec /bin/docker daemon $DOCKER_PARAMS" >> "$DOCKER_LOGFILE" 2>&1
+    eval "exec /bin/docker daemon $DOCKER_PARAMS >> \"$DOCKER_LOGFILE\" 2>&1"
   else
-    eval "/bin/docker daemon $DOCKER_PARAMS" >> "$DOCKER_LOGFILE" 2>&1 &
+    eval "/bin/docker daemon $DOCKER_PARAMS >> \"$DOCKER_LOGFILE\" 2>&1 &"
   fi
 }
 

diff --git a/overlay/init b/overlay/init
@@ -130,7 +130,7 @@ logger -s -p user.info -t "init[$$]" "Configuring sysctl"
 sysctl -p /etc/sysctl.conf
 
 logger -s -p user.info -t "init[$$]" "Starting Docker daemon"
-/etc/init.d/docker start &
+/etc/init.d/docker start
 
 set -mb
 trap '' SIGCHLD

diff --git a/overlay/sbin/shutdown b/overlay/sbin/shutdown
@@ -12,6 +12,9 @@ if [ -n "${CONTAINERS}" ]; then
   docker stop -t 2 ${CONTAINERS}
 fi
 
+logger -s -p user.info -t "$(basename $0)[$$]" "Stopping Docker daemon"
+/etc/init.d/docker stop
+
 logger -s -p user.info -t "$(basename $0)[$$]" "Executing shutdown scripts in /etc/init.d"
 /etc/init.d/rcK