packages (DEVEL): lms/lms.init - merged from HEAD

[paszczus]

Author: paszczus                     Date: Wed Jun 20 08:47:40 2012 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- merged from HEAD

---- Files affected:
packages/lms:
   lms.init (1.1.2.6 -> 1.1.2.7) 

---- Diffs:

================================================================
Index: packages/lms/lms.init
diff -u packages/lms/lms.init:1.1.2.6 packages/lms/lms.init:1.1.2.7
--- packages/lms/lms.init:1.1.2.6	Sun Nov  6 23:47:55 2005
+++ packages/lms/lms.init	Wed Jun 20 10:47:35 2012
@@ -36,9 +36,7 @@
 [ -z "$LMSD_DATABASE_HOST" ] && LMSD_DATABASE_HOST="localhost"
 [ -z "$LMSD_OPTIONS" ] && LMSD_OPTIONS=""
 
-RETVAL=0
-case "$1" in
-  start)
+start() {
 	if [ ! -f /var/lock/subsys/lmsd ]; then
 		msg_starting lmsd
 
@@ -48,32 +46,42 @@
 		export LMSDBPORT="$LMSD_DATABASE_PORT"
 		export LMSDBHOST="$LMSD_DATABASE_HOST"
 
-		daemon lmsd-$LMSD_DATABASE_TYPE $LMSD_OPTIONS
+		is_no "$RC_LOGGING" && fork=--fork
+		daemon $fork /usr/sbin/lmsd-$LMSD_DATABASE_TYPE $LMSD_OPTIONS
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/lmsd
 	else
 		msg_already_running lmsd
 	fi
-	;;
-  stop)
+}
+
+stop() {
 	if [ -f /var/lock/subsys/lmsd ]; then
 		msg_stopping lmsd
-		killproc lmsd-$LMSD_DATABASE_TYPE
+		killproc lmsd
 		sleep 1
 		rm -f /var/lock/subsys/lmsd >/dev/null 2>&1
 	else
 		msg_not_running lmsd
 	fi
+}
+
+RETVAL=0
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
 	;;
   restart)
-	$0 stop
-	$0 start
-	exit $?
+	stop
+	start
 	;;
   status)
-	status lmsd-$LMSD_DATABASE_TYPE
+	status lmsd
 	exit $?
-	;;			  
+	;;
   *)
 	msg_usage "$0 {start|stop|restart}"
 	exit 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/lms/lms.init?r1=1.1.2.6&r2=1.1.2.7