X-Git-Url: https://code.wpia.club/?p=cassiopeia.git;a=blobdiff_plain;f=debian%2Fcacert-cassiopeia.init;h=bc5b464d8cc2ee2670ac852eee736532a0a63e3a;hp=5ce7b2ac4733e5514270a9963a2a26282683e3d3;hb=5977614ee0582c67737713b1466bc726ec700bc0;hpb=b9093a80fe9374f5750ebe40b3c6490f62561da6

diff --git a/debian/cacert-cassiopeia.init b/debian/cacert-cassiopeia.init
index 5ce7b2a..bc5b464 100644
--- a/debian/cacert-cassiopeia.init
+++ b/debian/cacert-cassiopeia.init
@@ -18,7 +18,7 @@
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="cacert's signer software"
-NAME=cassiopeia
+NAME=cacert-cassiopeia
 DAEMON=/usr/bin/cassiopeia
 DAEMON_ARGS=
 PIDFILE=/var/run/$NAME.pid
@@ -30,6 +30,10 @@ DIR=/var/lib/cacert-gigi
 
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
+if [ "$START_DAEMON" = "0" ]; then
+    echo "Not starting $NAME (as configured in /etc/default/$NAME)";
+    exit 0;
+fi
 
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
@@ -44,9 +48,9 @@ DIR=/var/lib/cacert-gigi
 #
 do_start()
 {
-	if [ ! -f /var/lib/cacert-gigi/config.txt ]; then
+	if [ ! -f /etc/cacert/cassiopeia/cassiopeia.conf ]; then
 		echo Missing cassiopeia-configfile
-                exit 0
+                exit 2
         fi
 	# Return
 	#   0 if daemon has been started