Generic init

2 files changed, 12 insertions, 124 deletions

diff --git a/Makefile b/Makefile
index c07924d..6babfc8 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@ help:
 	@echo "make install - installs to /usr/sbin/mtu1280d"
 	@echo "make upstart - installs, including /etc/init/ script"
 	@echo "make init.d - installs, including /etc/init.d/ and runs chkconfig"
-	@test -d /etc/init && echo "we recommend make upstart (we found /etc/init)" || true
-	@test ! -d /etc/init && echo "we recommend make init.d (we did not find /etc/init)" || true
+	@test -d /etc/init && echo "RECOMMENDATION: make upstart (we found /etc/init)" || true
+	@test ! -d /etc/init && echo "RECOMMENDATION: make init.d (we did not find /etc/init)" || true
 
 mtu1280d: mtu1280d.c
 	gcc -o mtu1280d mtu1280d.c -lnetfilter_queue  || ( echo "see README.md for prerequisites" && exit 1 )
@@ -28,8 +28,7 @@ upstart: install
 
 init.d: install
 	/usr/bin/install -c init.d/mtu1280d /etc/init.d/
-	update-rc.d mtu1280d defaults
-	update-rc.d mtu1280d enable
+	test -x /usr/sbin/update-rc.d && update-rc.d mtu1280d defaults && update-rc.d mtu1280d enable || true
 	@echo "Reminder - start the daemon or reboot; then update your ip6tables."
 	@echo "See the README.md file."
 
@@ -46,9 +45,8 @@ pre-remove:
 	
 force-remove:
 	@echo "Removing any previous installation (including startup scripts) of mtu1280d"
-	rm -fr /usr/sbin/mtu1280d /etc/init/mtu1280d /etc/init.d/mtu1280d
-	update-rc.d mtu1280d remove
-
+	rm -fr /usr/sbin/mtu1280d /etc/init/mtu1280d.conf /etc/init.d/mtu1280d
+	rm -fr /etc/rc*/*mtu1280d* /etc/rc.d/init.d/mtu1280d
 
 remove: pre-remove force-remove
 
diff --git a/init.d/mtu1280d b/init.d/mtu1280d
index 72103c9..1063bc4 100644
--- a/init.d/mtu1280d
+++ b/init.d/mtu1280d
@@ -12,9 +12,8 @@
 
 # Author: Jason Fesler <jfesler@gigo.com>
 #
-# Do NOT "set -e"
+# Dumbed down init script that tries to satisify multiple OSs
 
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Synthetic ICMPv6 Packet Too Big response"
 NAME=mtu1280d
@@ -26,127 +25,19 @@ SCRIPTNAME=/etc/init.d/$NAME
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
 
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-	# Return
-	#   0 if daemon has been started
-	#   1 if daemon was already running
-	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-	# Add code here, if necessary, that waits for the process to be ready
-	# to handle requests from services started subsequently which depend
-	# on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	# Return
-	#   0 if daemon has been stopped
-	#   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
-	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	# Wait for children to finish too if this is a daemon that forks
-	# and if the daemon is only ever run from this initscript.
-	# If the above conditions are not satisfied then add some other code
-	# that waits for the process to drop all resources that could be
-	# needed by services started subsequently.  A last resort is to
-	# sleep for some time.
-	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-	#
-	# If the daemon can reload its configuration without
-	# restarting (for example, when it is sent a SIGHUP),
-	# then implement that here.
-	#
-	echo reload not implemented
-	return 1
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-	return 0
-}
-
 case "$1" in
   start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
+	$DAEMON $DAEMON_ARGS 
 	;;
   stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
+	ps auxww |grep $DAEMON | grep -v grep | awk '{print $2}' | xargs kill
 	;;
   status)
-	status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+	ps auxww |grep $NAME | grep -v grep
 	;;
-  #reload|force-reload)
-	#
-	# If do_reload() is not implemented then leave this commented out
-	# and leave 'force-reload' as an alias for 'restart'.
-	#
-	#log_daemon_msg "Reloading $DESC" "$NAME"
-	#do_reload
-	#log_end_msg $?
-	#;;
-  restart|force-reload)
-	#
-	# If the "reload" option is implemented then remove the
-	# 'force-reload' alias
-	#
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-		# Failed to stop
-		log_end_msg 1
-		;;
-	esac
+  reload|restart|force-reload)
+	ps auxww |grep $DAEMON | grep -v grep | awk '{print $2}'   | xargs kill
+	$DAEMON $DAEMON_ARGS
 	;;
   *)
 	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
@@ -155,4 +46,3 @@ case "$1" in
 	;;
 esac
 
-: