SOURCES: icecream-iceccd.init - fixes

[paszczus]

Author: paszczus                     Date: Tue Sep  9 13:24:11 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fixes

---- Files affected:
SOURCES:
   icecream-iceccd.init (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/icecream-iceccd.init
diff -u SOURCES/icecream-iceccd.init:1.2 SOURCES/icecream-iceccd.init:1.3
--- SOURCES/icecream-iceccd.init:1.2	Tue Sep  9 14:58:46 2008
+++ SOURCES/icecream-iceccd.init	Tue Sep  9 15:24:05 2008
@@ -24,9 +24,6 @@
 fi
 
 exec=/usr/sbin/iceccd
-service=iceccd
-
-lockfile=/var/lock/subsys/iceccd
 
 start() {
 	[ -x $exec ] || exit 5
@@ -57,30 +54,28 @@
 		fi
 	fi
 	params="$params -b \"$ICECREAM_BASEDIR\""
-	daemon $service $exec -d -u icecream $params
+	daemon $exec -d -u icecream $params
 	RETVAL=$?
-	[ $RETVAL -eq 0 ] && touch $lockfile
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/iceccd
         else
-                msg_already_running icecream
+                msg_already_running iceccd
         fi
 
 	return $RETVAL
 }
 
 stop() {
-	msg_stopping iceccd
-
-	killproc $service
-	RETVAL=$?
-	echo
-	if [ $RETVAL -eq 0 ]; then
-		rm -f $lockfile
+	if [ -f /var/lock/subsys/iceccd ]; then
+		msg_stopping iceccd
+		killproc iceccd 
+		rm -f /var/lock/subsys/iceccd
+	else
+		msg_not_running iceccd
 	fi
-	return $RETVAL
 }
 
 condrestart() {
-        if [ -f /var/lock/subsys/icecream ]; then
+        if [ -f /var/lock/subsys/iceccd ]; then
                 stop
                 start
         else
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/icecream-iceccd.init?r1=1.2&r2=1.3&f=u