SOURCES: rbldnsd.init - fix service names

[glen]

Author: glen                         Date: Mon Feb 20 18:09:23 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix service names

---- Files affected:
SOURCES:
   rbldnsd.init (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/rbldnsd.init
diff -u SOURCES/rbldnsd.init:1.4 SOURCES/rbldnsd.init:1.5
--- SOURCES/rbldnsd.init:1.4	Mon Feb 20 18:55:21 2006
+++ SOURCES/rbldnsd.init	Mon Feb 20 19:09:17 2006
@@ -14,7 +14,7 @@
 # Check that networking is up
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status -a "$1" != init ]; then
-		msg_network_down MySQL
+		msg_network_down rbldnsd
 		exit 1
 	fi
 else
@@ -22,7 +22,6 @@
 fi
 
 NAME=rbldnsd
-DESC=rbldnsd
 RBLDNSD=
 
 if [ -f /etc/sysconfig/rbldnsd ]; then
@@ -36,10 +35,11 @@
 forall() {
 	RETVAL=0
 
+	# FIXME: get rid of subshell to have exit codes proper for $RETVAL
 	echo "$RBLDNSD" |
 	while read name args; do
 		case "$name" in
-		""|\#*)
+		''|'#'*)
 			continue
 			;;
 		-)
@@ -75,12 +75,12 @@
 
 start() {
 	if [ ! "$pid" ]; then
-		msg_starting $name
+		msg_starting "rbldnsd $name"
 		runit
 		RETVAL=$?
 		[ "$RETVAL" = 0 ] && ok || fail
 	else
-		msg_already_running $name
+		msg_already_running "rbldnsd $name"
 	fi
 
 	return $RETVAL
@@ -88,13 +88,13 @@
 
 stop() {
 	if [ "$pid" ]; then
-		msg_stopping $name
+		msg_stopping "rbldnsd $name"
 		kill $pid
 		rm -f $pidfile
 		RETVAL=$?
 		[ "$RETVAL" = 0 ] && ok || fail
 	else
-		msg_not_running $name
+		msg_not_running "rbldnsd $name"
 	fi
 
 	return $RETVAL
@@ -102,11 +102,11 @@
 
 restart() {
 	if [ "$pid" ]; then
-		msg_stopping $name
+		msg_stopping "rbldnsd $name"
 		kill $pid
 		[ "$RETVAL" = 0 ] && ok || fail
 		RETVAL=$?
-		msg_starting $name
+		msg_starting "rbldnsd $name"
 		runit
 		[ "$RETVAL" != 0 ] && RETVAL=$?
 		[ "$RETVAL" = 0 ] && ok || fail
@@ -119,7 +119,7 @@
 
 reload() {
 	if [ "$pid" ]; then
-		msg_reloading $name
+		msg_reloading "rbldnsd $name"
 		kill -HUP $pid
 		RETVAL=$?
 		[ "$RETVAL" = 0 ] && ok || fail
================================================================

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