r3116 - vdr/vdr/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2006-07-18 19:24:15 +0000 (Tue, 18 Jul 2006)
New Revision: 3116

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/plugin-loader.sh
   vdr/vdr/trunk/debian/vdr.init
Log:
vdr: Added LSB-Headers and status action to debian/vdr.init; minor tweaks to plugins-loader.sh

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2006-07-15 19:04:53 UTC (rev 3115)
+++ vdr/vdr/trunk/debian/changelog	2006-07-18 19:24:15 UTC (rev 3116)
@@ -1,10 +1,10 @@
 vdr (1.4.1-1) UNRELEASED; urgency=low
 
   * (NOT RELEASED YET)
-  
+
   [ Thomas Günther ]
   * Upgraded opt-24_jumpplay-0.8.dpatch to opt-24_jumpplay.dpatch version 0.9
-  
+
   [ Tobias Grimm ]
   * New upstream release
   * Stripped default SHUTDOWNCMD to "shutdown -h now"
@@ -24,8 +24,9 @@
     on system which use UTF8 as default locale, this setting is also
     configurable in /etc/default/vdr
   * Added Tobias Grimm, Thomas Günther and myself to debian/copyright
+  * Added LSB-Headers and status action to debian/vdr.init
 
- -- Thomas Schmidt <tschmidt at debian.org>  Sat,  8 Jul 2006 15:49:59 +0200
+ -- Thomas Schmidt <tschmidt at debian.org>  Tue, 18 Jul 2006 21:22:31 +0200
 
 vdr (1.4.0-2) unstable; urgency=low
 

Modified: vdr/vdr/trunk/debian/plugin-loader.sh
===================================================================
--- vdr/vdr/trunk/debian/plugin-loader.sh	2006-07-15 19:04:53 UTC (rev 3115)
+++ vdr/vdr/trunk/debian/plugin-loader.sh	2006-07-18 19:24:15 UTC (rev 3116)
@@ -43,7 +43,7 @@
 
     if [ "$PLUGIN_CHECK_PATCHLEVEL" == "yes" ]; then
         # extract patchlevel info
-        eval "patchlevels=($(LANG=en;dpkg -s ${packages[@]} 2>&1 | awk -F ':' '\
+        eval "patchlevels=($(LANG=C;dpkg -s ${packages[@]} 2>&1 | awk -F ':' '\
             /^Package: /                         {p=$2} \
             /^Package.*is not installed/         {print "\"\""} \
             (/[pP]atchlevel:/ || /^$/) && p!=""  {print "\""$2"\"";p=""}'))"
@@ -112,14 +112,14 @@
     done
 
     # warn about incompatible plugins
-    if [ "$leftout" != "" ]; then
+    if [ ! -z "$leftout" ]; then
         echo -ne "\nWARNING: The following plugins have been left out due to"\
              "possible binary incompatibility: "
         echo -n $leftout
     fi
 
     # warn about not startable plugins
-    if [ "$leftout2" != "" ]; then
+    if [ ! -z "$leftout2" ]; then
         echo -ne "\nWARNING: The following plugins have been left out due to"\
              "really binary incompatibility: "
         echo -n $leftout2

Modified: vdr/vdr/trunk/debian/vdr.init
===================================================================
--- vdr/vdr/trunk/debian/vdr.init	2006-07-15 19:04:53 UTC (rev 3115)
+++ vdr/vdr/trunk/debian/vdr.init	2006-07-18 19:24:15 UTC (rev 3116)
@@ -2,6 +2,18 @@
 #
 # vdr start-stop script
 #
+### BEGIN INIT INFO
+# Provides:          vdr
+# Required-Start:    $network $syslog
+# Required-Stop:     $network $syslog
+# Should-Start:      $local_fs $remote_fs
+# Should-Stop:       $local_fs $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Starts the Linux Video Disk Recorder (VDR)
+# Description:       Starts the Linux Video Disk Recorder (VDR),
+#                    if it is enabled in /etc/default/vdr.
+### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 NAME=vdr
@@ -41,6 +53,19 @@
     fi
 }
 
+get_status()
+{
+    if start-stop-daemon --start --startas $DAEMON --test \
+        --name $(basename $DAEMON) --pidfile $PIDFILE >/dev/null
+    then
+        echo " - is not running."
+        exit 3
+    else
+        echo " - is running."
+        exit 0
+    fi
+}
+
 startvdr()
 {
     if [ "$ENABLED" != "0" ] ; then
@@ -96,6 +121,10 @@
         startvdr
         echo "."
         ;;
+    status)
+        echo -n "Getting status of $DESC: $NAME"
+        get_status
+        ;;
     *)
         N=/etc/init.d/$NAME
         echo "Usage: $N {start|stop|restart|force-reload}" >&2