From de50b560876d1bb3fdc0a4e87b09a1790745e0a2 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Sun, 16 Jul 2017 16:48:22 +0200 Subject: docker: Fix and update sysvinit script Fix daemonization, align args with docker.service, fix line breaks in log file - and fix INITSCRIPT_PARAMS (there is no variable OS_DEFAULT_INITSCRIPT_PARAMS). Signed-off-by: Jan Kiszka Signed-off-by: Bruce Ashfield --- recipes-containers/docker/files/docker.init | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'recipes-containers/docker/files/docker.init') diff --git a/recipes-containers/docker/files/docker.init b/recipes-containers/docker/files/docker.init index 9c01c758..2e8eb9e4 100644 --- a/recipes-containers/docker/files/docker.init +++ b/recipes-containers/docker/files/docker.init @@ -28,6 +28,7 @@ exec="/usr/bin/$prog" pidfile="/var/run/$prog.pid" lockfile="/var/lock/subsys/$prog" logfile="/var/log/$prog" +other_args="--registry-mirror=http://localhost:5000 --insecure-registry=http://localhost:5000 --raw-logs" [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog @@ -38,8 +39,8 @@ start() { if ! [ -f $pidfile ]; then printf "Starting $prog:\t" - echo "\n$(date)\n" >> $logfile - "$unshare" -m -- $exec -d $other_args &>> $logfile & + echo -e "\n$(date)\n" >> $logfile + "$unshare" -m -- $exec daemon $other_args &>> $logfile & pid=$! touch $lockfile # wait up to 10 seconds for the pidfile to exist. see -- cgit v1.2.3-54-g00ecf