X-Git-Url: https://pwan.org/git/?p=certmaster.git;a=blobdiff_plain;f=init-scripts%2Fcertmaster;h=6cfe4c28393c756c320913f3d1fb03cc473490ea;hp=95c16fcdcd7cdddda2970b97770ea8d452269d73;hb=8092325418f916bf744437c3c42acf4d22ca0a61;hpb=ca8dd9b8ac04f18b550225a9cbbd927b1dc61794

diff --git a/init-scripts/certmaster b/init-scripts/certmaster
index 95c16fc..6cfe4c2 100755
--- a/init-scripts/certmaster
+++ b/init-scripts/certmaster
@@ -63,22 +63,38 @@ fi
 RETVAL=0
 
 start() {
-    echo -n $"Starting certmaster daemon: "
-    START_DAEMON $PROCESS $CONFIG_ARGS
-    RETVAL=$?
-    echo
-    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
-    return $RETVAL
+    if [ -f /etc/debian_version ]; then
+        log_begin_msg "Starting certmaster daemon: "
+        start-stop-daemon --exec $DAEMON --start --quiet -- $CONFIG_ARGS > /dev/null
+        RETVAL=$?
+        log_end_msg $RETVAL
+        return $RETVAL
+    else
+	echo -n $"Starting certmaster daemon: "
+	START_DAEMON $PROCESS $CONFIG_ARGS
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$SERVICE
+	return $RETVAL
+    fi
 }
 
 stop() {
-    echo -n $"Stopping certmaster daemon: "
-    killproc $PROCESS
-    RETVAL=$?
-    echo
-    if [ $RETVAL -eq 0 ]; then
-	rm -f /var/lock/subsys/$SERVICE
-        rm -f /var/run/$SERVICE.pid
+    if [ -f /etc/debian_version ]; then
+        log_daemon_msg "Stopping certmaster daemon" "certmaster"
+        start-stop-daemon --stop --quiet --pidfile /var/run/certmaster.pid --name certmaster
+        RETVAL=$?
+        log_end_msg $RETVAL
+        rm -f /var/run/certmaster.pid
+    else
+	echo -n $"Stopping certmaster daemon: "
+	killproc $PROCESS
+	RETVAL=$?
+	echo
+	if [ $RETVAL -eq 0 ]; then
+	    rm -f /var/lock/subsys/$SERVICE
+            rm -f /var/run/$SERVICE.pid
+	fi
     fi
 }