From e3772538c0eb5c1478075979d222485cb3bd8c91 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Mon, 17 Aug 2015 12:01:13 -0500 Subject: [PATCH] Fix OpenRC init script The shebang for OpenRC init scripts is now #!/sbin/openrc-run, and we can also use the default start and stop functions built into OpenRC. Signed-off-by: William Hubbs --- contrib/init/openrc/docker.initd | 33 +++++++++----------------------- 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/contrib/init/openrc/docker.initd b/contrib/init/openrc/docker.initd index 221776c246..ea8a3b2213 100644 --- a/contrib/init/openrc/docker.initd +++ b/contrib/init/openrc/docker.initd @@ -1,34 +1,19 @@ -#!/sbin/runscript +#!/sbin/openrc-run # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ -DOCKER_LOGFILE=${DOCKER_LOGFILE:-/var/log/${SVCNAME}.log} -DOCKER_PIDFILE=${DOCKER_PIDFILE:-/run/${SVCNAME}.pid} -DOCKER_BINARY=${DOCKER_BINARY:-/usr/bin/docker} -DOCKER_OPTS=${DOCKER_OPTS:-} +command="${DOCKER_BINARY:-/usr/bin/docker}" +pidfile="${DOCKER_PIDFILE:-/run/${RC_SVCNAME}.pid}" +command_args="daemon -p \"${pidfile}\" ${DOCKER_OPTS}" +DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}" +start_stop_daemon_args="--background \ + --stderr \"${DOCKER_LOGFILE}\" --stdout \"${DOCKER_LOGFILE}\"" -start() { +start_pre() { checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE" ulimit -n 1048576 ulimit -u 1048576 - ebegin "Starting docker daemon" - start-stop-daemon --start --background \ - --exec "$DOCKER_BINARY" \ - --pidfile "$DOCKER_PIDFILE" \ - --stdout "$DOCKER_LOGFILE" \ - --stderr "$DOCKER_LOGFILE" \ - -- daemon -p "$DOCKER_PIDFILE" \ - $DOCKER_OPTS - eend $? -} - -stop() { - ebegin "Stopping docker daemon" - start-stop-daemon --stop \ - --exec "$DOCKER_BINARY" \ - --pidfile "$DOCKER_PIDFILE" - eend $? + return 0 }