extras-buildsys/etc plague-builder.init, 1.7, 1.7.2.1 plague-server.init, 1.2, 1.2.2.1

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17932/etc

Modified Files:
      Tag: STABLE_0_4
	plague-builder.init plague-server.init 
Log Message:
2005-12-01  Dan Williams  <dcbw at redhat.com>

    Patch from Rudolf Kastl <che666 at gmail.com> #rh174573#:
    * etc/plague-server.init
      etc/plague-builder.init
        - Add nls support to initscripts
        - initscript cleanups




Index: plague-builder.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- plague-builder.init	31 Aug 2005 19:29:21 -0000	1.7
+++ plague-builder.init	1 Dec 2005 18:43:41 -0000	1.7.2.1
@@ -13,20 +13,28 @@
 # Source function library.
 . /etc/init.d/functions
 
+prog="plague-builder"
+
+if [ -f /etc/sysconfig/plague-builder ]; then
 . /etc/sysconfig/plague-builder
+fi
 
 start() {
-	echo -n "Starting plague-builder: "
+	if [ ! -f /var/lock/subsys/plague-builder ]; then
+	echo -n $"Starting $prog: "
 	daemon plague-builder -c $CONFIG -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log
 	echo
 	touch /var/lock/subsys/plague-builder
 	return 0
+	fi
 }	
 
 stop() {
-	echo -n "Shutting down plague-builder: "
+	if test "x`pidof plague-builder`" != x; then
+	echo -n $"Stopping $prog: "
 	killproc plague-builder
 	echo
+	fi
 	rm -f /var/lock/subsys/plague-builder
 	return 0
 }


Index: plague-server.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- plague-server.init	15 Aug 2005 03:18:19 -0000	1.2
+++ plague-server.init	1 Dec 2005 18:43:41 -0000	1.2.2.1
@@ -13,20 +13,28 @@
 # Source function library.
 . /etc/init.d/functions
 
+prog="plague-server"
+
+if [ -f /etc/sysconfig/plague-server ]; then
 . /etc/sysconfig/plague-server
+fi
 
 start() {
-	echo -n "Starting plague-server: "
+	if [ ! -f /var/lock/subsys/plague-server ]; then
+	echo -n $"Starting $prog: "
 	daemon plague-server -c $CONFIG -d -p /var/run/plague-server.pid -l /var/log/plague-server.log
 	echo
 	touch /var/lock/subsys/plague-server
 	return 0
+	fi
 }	
 
 stop() {
-	echo -n "Shutting down plague-server: "
+	if test "x`pidof plague-server`" != x; then
+	echo -n $"Stopping $prog: "
 	killproc plague-server
 	echo
+	fi
 	rm -f /var/lock/subsys/plague-server
 	return 0
 }