rpms/vdr/devel vdr.spec, 1.23.2.9, 1.23.2.10 vdr.init, 1.7.2.1, 1.7.2.2

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/vdr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10932

Modified Files:
      Tag: vdr-1_6-test
	vdr.spec vdr.init 
Log Message:
kill -HUP only a running service, otherwise stop+start.


Index: vdr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.spec,v
retrieving revision 1.23.2.9
retrieving revision 1.23.2.10
diff -u -r1.23.2.9 -r1.23.2.10
--- vdr.spec	7 Apr 2008 15:08:19 -0000	1.23.2.9
+++ vdr.spec	7 Apr 2008 15:14:45 -0000	1.23.2.10
@@ -491,6 +491,7 @@
 - Apply Luca Olivetti's DXR3 subtitle compatibility patch.
 - Decrease default wakeup delay before a timed recording to 10 minutes.
 - Don't reload DVB drivers by default on unexpected exits in runvdr.
+- Use "kill -HUP" in init script's restart action only on a running service.
 
 * Sun Apr  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-0.4
 - Obsolete vdr-subtitles.


Index: vdr.init
===================================================================
RCS file: /cvs/pkgs/rpms/vdr/devel/vdr.init,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -r1.7.2.1 -r1.7.2.2
--- vdr.init	24 Mar 2008 16:07:35 -0000	1.7.2.1
+++ vdr.init	7 Apr 2008 15:14:45 -0000	1.7.2.2
@@ -77,7 +77,12 @@
 }
 
 restart() {
-    action $"Restarting Video Disk Recorder ($prog): " killproc $prog -HUP
+    if status $prog >/dev/null ; then
+        action $"Restarting Video Disk Recorder ($prog): " killproc $prog -HUP
+    else
+        stop
+        start
+    fi
 }
 
 case "$1" in