From 2a0f80b497dee966615b579ccb25414fcfd78693 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 18 Dec 2015 10:46:34 +0000 Subject: [PATCH] clean up rc files Signed-off-by: Justin Cormack --- alpine/etc/init.d/9pudc | 17 +++++++++-------- alpine/etc/init.d/mdnstool | 19 ++++++++++--------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/alpine/etc/init.d/9pudc b/alpine/etc/init.d/9pudc index 5fa9ceac7..3b52bc90e 100755 --- a/alpine/etc/init.d/9pudc +++ b/alpine/etc/init.d/9pudc @@ -13,12 +13,13 @@ start() [ -n "${PIDFILE}" ] || PIDFILE=/var/run/9pudc.pid -# start-stop-daemon --start --quiet \ -# --exec /sbin/9pudc \ -# --pidfile "${PIDFILE}" \ -# -- -path /Socket -sock /var/run/docker.sock -# eend $? "Failed to start 9pudc" - /sbin/9pudc -path /Socket -sock /var/run/docker.sock -detach & + start-stop-daemon --start --quiet \ + --background \ + --exec /sbin/9pudc \ + --make-pidfile --pidfile ${PIDFILE} \ + -- -path /Socket -sock /var/run/docker.sock + + eend $? "Failed to start 9pudc" } stop() @@ -27,7 +28,7 @@ stop() [ -n "${PIDFILE}" ] || PIDFILE=/var/run/9pudc.pid - start-stop-daemon --stop --quiet \ - --pidfile "${PIDFILE}" + start-stop-daemon --stop --quiet --pidfile ${PIDFILE} + eend $? "Failed to stop 9pudc" } diff --git a/alpine/etc/init.d/mdnstool b/alpine/etc/init.d/mdnstool index 1faf613a2..1dcffec85 100755 --- a/alpine/etc/init.d/mdnstool +++ b/alpine/etc/init.d/mdnstool @@ -14,14 +14,15 @@ start() [ -n "${PIDFILE}" ] || PIDFILE=/var/run/mdnstool.pid - HOSTNAME=$(hostname -s).local. + export HOSTNAME=$(hostname -s).local. -# start-stop-daemon --start --quiet \ -# --exec /sbin/mdnstool \ -# --pidfile "${PIDFILE}" \ -# -- if eth0 -hostname ${HOSTNAME} -# eend $? "Failed to start mDNS server" - /sbin/mdnstool if eth0 -hostname ${HOSTNAME} -detach & + start-stop-daemon --start --quiet \ + --background \ + --exec /sbin/mdnstool \ + --make-pidfile --pidfile ${PIDFILE} \ + -- if eth0 -hostname ${HOSTNAME} + + eend $? "Failed to start mDNS server" } stop() @@ -30,7 +31,7 @@ stop() [ -n "${PIDFILE}" ] || PIDFILE=/var/run/mdnstool.pid - start-stop-daemon --stop --quiet \ - --pidfile "${PIDFILE}" + start-stop-daemon --stop --quiet --pidfile ${PIDFILE} + eend $? "Failed to stop mDNS server" }