From: short <>
Date: Tue, 15 Jun 2004 11:54:22 +0000 (+0000)
Subject: Implemented LSB init scripts compliance.
X-Git-Tag: udpgate-1_0_1~1
X-Git-Url: https://git.jankratochvil.net/?p=udpgate.git;a=commitdiff_plain;h=b8c4074b648c36c9f31f5173d77ebf7f151f1498

Implemented LSB init scripts compliance.
---

diff --git a/init.d/Makefile.am b/init.d/Makefile.am
index 9e4788d..aaaa444 100644
--- a/init.d/Makefile.am
+++ b/init.d/Makefile.am
@@ -18,7 +18,7 @@
 
 include $(top_srcdir)/Makefile-head.am
 
-initddir=$(sysconfdir)/rc.d/init.d
+initddir=$(sysconfdir)/init.d
 initd_SCRIPTS=udpgate
 EXTRA_DIST+=udpgate.init
 CLEANFILES+=udpgate
diff --git a/init.d/udpgate.init b/init.d/udpgate.init
index 4f526a6..5c72dc7 100755
--- a/init.d/udpgate.init
+++ b/init.d/udpgate.init
@@ -4,9 +4,6 @@
 # chkconfig: 2345 98 02
 # description: UDP packets gateway
 
-# Source function library.
-. /etc/rc.d/init.d/functions
-
 # Source our configuration file for these variables.
 PORT=9201
 LOCATION=/usr/bin/udpgate
@@ -18,7 +15,7 @@ prog="udpgate"
 
 start() {
 	echo -n $"Starting $prog: " 
-	daemon $LOCATION --start --port=$PORT
+	$LOCATION --start --port=$PORT
 	RETVAL=$?
 	echo
 	return $RETVAL
@@ -36,27 +33,22 @@ case "$1" in
 		start)
 			start
 			;;
-		
 		stop)
 			stop
 			;;
-		
 		status)
-			status udpgate
 			;;
 		restart)
 			stop
 			start
 			;;
 		condrestart)
-			if test "x`pidof udpgate`" != x; then
-				stop
-				start
-			fi
+			stop
+			start
 			;;
 		
 		*)
-			echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+			echo $"Usage: $0 {start|stop|restart}"
 			exit 1
 
 esac