fedora-rpmdevtools rpmdevtools.spec, 1.40, 1.41 template.init, 1.4, 1.5

[Ville Skytta (scop)]

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26747

Modified Files:
	rpmdevtools.spec template.init 
Log Message:
Init script template cleanups.


Index: rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/rpmdevtools.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- rpmdevtools.spec	28 Aug 2007 14:25:55 -0000	1.40
+++ rpmdevtools.spec	5 Sep 2007 21:41:23 -0000	1.41
@@ -111,6 +111,9 @@
 
 
 %changelog
+* Thu Sep  6 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Init script template cleanups.
+
 * Tue Aug 28 2007 Ville Skyttä <ville.skytta at iki.fi>
 - Update rpminfo to version 2004-07-07-02.
 


Index: template.init
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/template.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- template.init	5 Jul 2007 20:08:18 -0000	1.4
+++ template.init	5 Sep 2007 21:41:23 -0000	1.5
@@ -26,12 +26,6 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-# Source networking configuration.
-. /etc/sysconfig/network
-
-# Check that networking is up.
-[ "$NETWORKING" = "no" ] && exit 0
-
 exec="/path/to/<daemonname>"
 prog=$(basename $exec)
 
@@ -62,32 +56,27 @@
     start
 }
 
-reload() {
-    restart
-}
-
-force_reload() {
-    restart
-}
-
-fdr_status() {
-    status $prog
-}
-
 case "$1" in
     start|stop|restart|reload)
         $1
         ;;
     force-reload)
-        force_reload
+        restart
         ;;
     status)
-        fdr_status
+        status $prog
         ;;
-    condrestart|try-restart)
-  	[ ! -f $lockfile ] || restart
+    try-restart|condrestart)
+        if status $prog >/dev/null ; then
+            restart
+        fi
 	;;
+    reload)
+        # If config can be reloaded without restarting, implement it here,
+        # remove the "exit", and add "reload" to the usage message below.
+        action $"Service $prog does not support the reload action: " /bin/false
+        exit 3
     *)
-        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|force-reload}"
         exit 2
 esac