Skip to content

Commit

Permalink
Merge pull request docker#1034 from gesellix/patch-1
Browse files Browse the repository at this point in the history
use new 'daemon' command
  • Loading branch information
tianon committed Aug 13, 2015
2 parents 5986633 + 3887b87 commit 1df8dc3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions rootfs/rootfs/usr/local/etc/init.d/docker
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ start() {
ulimit -p $DOCKER_ULIMITS

echo "------------------------" >> "$DOCKER_LOGFILE"
echo "/usr/local/bin/docker -d -D -g \"$DOCKER_DIR\" -H unix:// $DOCKER_HOST $EXTRA_ARGS >> \"$DOCKER_LOGFILE\"" >> "$DOCKER_LOGFILE"
/usr/local/bin/docker -d -D -g "$DOCKER_DIR" -H unix:// $DOCKER_HOST $EXTRA_ARGS >> "$DOCKER_LOGFILE" 2>&1 &
echo "/usr/local/bin/docker daemon -D -g \"$DOCKER_DIR\" -H unix:// $DOCKER_HOST $EXTRA_ARGS >> \"$DOCKER_LOGFILE\"" >> "$DOCKER_LOGFILE"
/usr/local/bin/docker daemon -D -g "$DOCKER_DIR" -H unix:// $DOCKER_HOST $EXTRA_ARGS >> "$DOCKER_LOGFILE" 2>&1 &
}

stop() {
Expand Down

0 comments on commit 1df8dc3

Please sign in to comment.