X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dstreamserv.init;h=53082453f66c9f5c4e0b320adf6a42260a3b47eb;hb=6c630f97431ebb7b4f7db901334ff136e4d25520;hp=c1244f2b2653a620c277564ef0f8b95a143b07d0;hpb=df268f63fdb596ec1f815f707bc17c30d61e13e3;p=packages%2Fdstreamserv.git

diff --git a/dstreamserv.init b/dstreamserv.init
index c1244f2..5308245 100755
--- a/dstreamserv.init
+++ b/dstreamserv.init
@@ -2,8 +2,8 @@
 #
 # Script for starting and stoping Darwin Streaming Server
 #
-# chkconfig: 345 55 45
-# description: DarwinStreamingServer
+# chkconfig:	345 55 45
+# description:	DarwinStreamingServer
 # Source function library.
 . /etc/rc.d/init.d/functions
 
@@ -11,67 +11,67 @@
 . /etc/sysconfig/network
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-        msg_Network_Down DSS
-        exit 1
+if is_yes "${NETWORKING}"; then
+	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+		msg_network_down DSS
+		exit 1
+	fi
+else
+	exit 0
 fi
 
 # Get service config
 [ -f /etc/sysconfig/DSS ] && . /etc/sysconfig/DSS
 
 err_exit() {
-    echo @$
-    exit 1
+	echo @$
+	exit 1
 }
 
-
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
-        # Check if the service is already running?
-        if [ ! -f /var/lock/subsys/DSS ]; then
-                msg_starting DSS
-                daemon /usr/local/sbin/DarwinStreamingServer 
+	# Check if the service is already running?
+	if [ ! -f /var/lock/subsys/DSS ]; then
+		msg_starting DSS
+		daemon /usr/sbin/DarwinStreamingServer
 		RETVAL=$?
-                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/DSS
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/DSS
 		msg_starting "DSS Admin"
-		daemon /usr/local/sbin/streamingadminserver.pl
-		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/DSS-admin 
-	        RETVAL=$?
-                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/DSS
- 	 else
-                msg_Already_Running DSS
-                exit 1
-        fi
-																				
-        ;;
+		daemon /usr/sbin/streamingadminserver.pl
+		RET=$?
+		[ $RETVAL -eq 0 ] && RETVAL=$RET
+	else
+		msg_already_running DSS
+	fi
+
+	;;
   stop)
-        # Stop daemons.
+	# Stop daemons.
 	if [ -f /var/lock/subsys/DSS ]; then
-	        msg_stopping DSS
-	        killproc DarwinStreamingServer 
-	        rm -f /var/lock/subsys/DSS >/dev/null 2>&1
+		msg_stopping DSS
+		killproc DarwinStreamingServer
 		msg_stopping "DSS Admin"
-		ps x|grep 'streaming'|grep -v grep|awk '{print $1};' |xargs kill
-		RETVAL=$?
-		rm -f /var/lock/subsys/DSS-admin > /dev/null 2>&1
+		kill -9 `cat /var/run/streamingadminserver.pid`
+		rm -f /var/run/streamingadminserver.pid
+		rm -f /var/lock/subsys/DSS >/dev/null 2>&1
 	else
-                msg_Not_Running DSS
-                exit 1
-        fi
-        ;;
-  restart)
+		msg_not_running DSS
+	fi
+	;;
+  restart|force-reload)
 	$0 stop
 	$0 start
-        ;;
+	exit $?
+	;;
   status)
-        status DSS
+	status DSS
 	exit $?
-        ;;
+	;;
   *)
-        msg_Usage "$0 {start|stop|restart|status}"
-        exit 1
+	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	exit 3
 esac
 
 exit $RETVAL