X-Git-Url: https://pwan.org/git/?a=blobdiff_plain;f=init-scripts%2Fcertmaster;h=4642f812069362cfcacb6bb34ee7d158e4498334;hb=8513efd091ed3e2beca32436b94132cf1451b119;hp=95c16fcdcd7cdddda2970b97770ea8d452269d73;hpb=4a7f409334528affd3b0245f9fe6e0b35e50e54b;p=certmaster.git

diff --git a/init-scripts/certmaster b/init-scripts/certmaster
index 95c16fc..4642f81 100755
--- a/init-scripts/certmaster
+++ b/init-scripts/certmaster
@@ -8,8 +8,6 @@
 ### BEGIN INIT INFO
 # Provides: certmaster
 # Required-Start: network
-# Default-Start: 3 4 5
-# Default-Stop: 0 1 2 6
 # Short-Description: certificate master for Fedora Unified Network Control 'master server only'
 # Description: certificate master to sign/manage ca/cert infrastructure
 ### END INIT INFO
@@ -39,6 +37,7 @@ CAStatus()
     RVAL=3
     echo "certmaster is not running"
   fi
+  return $RVAL
 }
 
 if [ -f /lib/lsb/init-functions ]; then
@@ -63,22 +62,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
 }