Changeset 481 for trunk/init

Timestamp:

Jul 18, 2015, 5:06:52 PM (9 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

Location:

trunk/init

Files:

• samhain.startGentoo.in (modified) (1 diff)
• samhain.startLSB.in (modified) (1 diff)
• samhain.startLinux.in (modified) (5 diffs)

trunk/init/samhain.startGentoo.in

@@ -9 +9 @@
 start() {
         ebegin "Starting @install_name@"
-        @sh_insmod_pre@
         /sbin/start-stop-daemon --start --quiet  --exec @sbindir@/@install_name@
         eend $?
-        @sh_insmod_cmd@
 }
 

trunk/init/samhain.startLSB.in

@@ -87 +87 @@
 case "$1" in
   start)
-        #
-        # Preloaded kernel module
-        #
-        @sh_insmod_pre@
-        #
         ${DAEMON} start
         ERRNUM=$?
-        #
-        # The hiding kernel module
-        #
-        if [ $ERRNUM -eq 0 ]; then
-                @sh_insmod_cmd@
-        fi
-        #
         SH_ACT="started"
         ;;

trunk/init/samhain.startLinux.in

@@ -1 +1 @@
 #!/bin/bash
+
 # chkconfig: 2345 99 10
 # description: File Integrity Checking Daemon
@@ -8 +9 @@
 # database: @mydatafile@
 #
+
+### BEGIN INIT INFO
+# Provides: @install_name@
+# Required-Start: $syslog $network
+# Required-Stop: $syslog $network
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Keep an eye on stuff
+# Description: Keep an eye on stuff
+### END INIT INFO
 
 # For Debian
@@ -140 +151 @@
         fi
         #
-        # Preloaded kernel module
-        #
-        @sh_insmod_pre@
-        #
         case "$DISTRO" in
         debian)
                 echo -n "Starting ${NAME}"
-                ( /sbin/start-stop-daemon --start --quiet --exec $DAEMON )
+                ( /sbin/start-stop-daemon --start --oknodo --quiet --exec $DAEMON )
                 RETVAL=$?
                 debian_end
@@ -183 +190 @@
                 ;;
         esac
-        #
-        # The hiding kernel module
-        #
-        if [ $RETVAL -eq 0 ]; then
-                @sh_insmod_cmd@
-        fi
         exit $RETVAL
         ;;
@@ -196 +197 @@
         debian)
                 echo -n "Stopping $NAME"
-                ( /sbin/start-stop-daemon --stop --quiet --exec $DAEMON )
+                ( /sbin/start-stop-daemon --stop --oknodo --quiet --exec $DAEMON )
                 RETVAL=$? 
                 debian_end