SOURCES: inspircd.init - fix messages

[aredridel]

Author: aredridel                    Date: Mon Apr 23 17:36:08 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix messages

---- Files affected:
SOURCES:
   inspircd.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/inspircd.init
diff -u SOURCES/inspircd.init:1.3 SOURCES/inspircd.init:1.4
--- SOURCES/inspircd.init:1.3	Mon Apr 23 19:33:25 2007
+++ SOURCES/inspircd.init	Mon Apr 23 19:36:03 2007
@@ -29,10 +29,7 @@
 	daemon --user inspircd inspircd -f /etc/inspircd/inspircd.conf --logfile /var/log/inspircd/inspircd.log
 	RETVAL=$?
 	if [ $RETVAL -eq 0 ]; then
-		ok
-	   	touch /var/lock/subsys/inspircd
-	else
-		fail
+		touch /var/lock/subsys/inspircd
 	fi
 	return $RETVAL
 }
@@ -45,8 +42,7 @@
 reload() {
 	# sending INT signal will make inspircd close all listening sockets and
 	# wait for client connections to terminate.
-	killproc --pidfile /var/run/inspircd.pid inspircd -INT
-	daemon --user inspircd inspircd -f /etc/inspircd/inspircd.conf --logfile /var/log/inspircd/inspircd.log
+	killproc --pidfile /var/run/inspircd.pid inspircd -HUP
 }
 
 RETVAL=0
@@ -76,17 +72,10 @@
 	;;
   restart)
 	if [ -f /var/lock/subsys/inspircd ]; then
-		# short circuit to safe reload if pid exists and is alive
-		pid=$(pidofproc inspircd inspircd.pid)
-		if [ "$pid" ] && checkpid $pid; then
-			msg_reloading inspircd
-			reload
-		else
-			msg_stopping inspircd
-			stop
-			msg_starting inspircd
-			start
-		fi
+		msg_stopping inspircd
+		stop
+		msg_starting inspircd
+		start
 		RETVAL=$?
 	else
 		msg_not_running inspircd
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/inspircd.init?r1=1.3&r2=1.4&f=u