From: ankry <ankry@pld-linux.org>
Date: Sun, 4 May 2003 20:17:15 +0000 (+0000)
Subject: - cleaning
X-Git-Tag: auto/ac/crossfire-1_5_0-2~13
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcrossfire.git;a=commitdiff_plain;h=83bbb257c722c35a58c9d05dc95b66a45c6c1284

- cleaning

Changed files:
    crossfire.init -> 1.5
---

diff --git a/crossfire.init b/crossfire.init
index e92b6c4..ad5d672 100644
--- a/crossfire.init
+++ b/crossfire.init
@@ -16,9 +16,13 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin
 . /etc/sysconfig/crossfire
 
 # Check that networking is up.
-if is_no "${NETWORKING}"; then
-	msg_network_down crossfire
-	exit 1
+if is_yes "${NETWORKING}"; then
+	if [ ! -f /var/lock/subsys/network ]; then
+		msg_network_down crossfire
+		exit 1
+	fi
+else
+	exit 0
 fi
 
 TMPDIR="/tmp"; export TMPDIR
@@ -51,7 +55,7 @@ case "$1" in
 		killproc crossfire
 		rm -f /var/lock/subsys/crossfire >/dev/null 2>&1
 	else
-		msg_Not_Running crossfire
+		msg_not_running crossfire
 		exit 1
 	fi
 	;;
@@ -67,14 +71,17 @@ case "$1" in
   reload)
 	if [ -f /var/lock/subsys/crossfire ]; then
 		msg_reloading crossfire
+		busy
 		killproc crossfire
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && ok || died
 	else
 		msg_not_running crossfire
 		exit 1
 	fi
 	;;
   *)
-	msg_Usage "$0 {start|stop|restart|reload|status}"
+	msg_usage "$0 {start|stop|restart|reload|status}"
 	exit 1
 esac