r1204 - vdr/vdr/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2005-09-05 21:20:45 +0000 (Mon, 05 Sep 2005)
New Revision: 1204

Modified:
   vdr/vdr/trunk/debian/changelog
   vdr/vdr/trunk/debian/vdr.init
Log:
vdr: show a small note about enabling the daemon in /etc/default/vdr when it is disabled ;-)

Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog	2005-09-04 15:46:09 UTC (rev 1203)
+++ vdr/vdr/trunk/debian/changelog	2005-09-05 21:20:45 UTC (rev 1204)
@@ -8,6 +8,9 @@
     - Build-Depend on libncurses5-dev, so the skincurses plugin gets compiled
     - Install the plugins svccli, svcsvr, skincurses and svdrpdemo into the
       vdr-plugin-examples package
+    - Modified the init-script to not exit silently if vdr is disabled in 
+      /etc/default/vdr (which is the default), instead of this showing a small
+      note how to enable the daemon
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun,  4 Sep 2005 17:18:11 +0200
 

Modified: vdr/vdr/trunk/debian/vdr.init
===================================================================
--- vdr/vdr/trunk/debian/vdr.init	2005-09-04 15:46:09 UTC (rev 1203)
+++ vdr/vdr/trunk/debian/vdr.init	2005-09-05 21:20:45 UTC (rev 1204)
@@ -14,27 +14,29 @@
 test "$ENABLE_SHUTDOWN" = "1" && VDRSHUTDOWN="/usr/lib/vdr/vdr-shutdown.wrapper" \
         || VDRSHUTDOWN="/usr/lib/vdr/vdr-shutdown-message"
 
-test "$ENABLED" != "0" || exit 0
-
 startvdr() 
 {
-    # only start vdr if there is no other instance running
-    # (Appears as vdr-kbd in the official debian-packages
-    # and just as vdr in the c't-vdr packages)
-    if ! ps ax | grep "/usr/bin/\(vdr\|vdr-kbd\) " | grep -qv grep
-    then
-        . /usr/lib/vdr/plugin-loader.sh
-        . /usr/lib/vdr/commands-loader.sh
-        getplugins
-        mergecommands "commands"
-        mergecommands "reccmds"
-        start-stop-daemon --start --quiet --background \
-                --exec /usr/sbin/runvdr -- -v $VIDEO_DIR -c $CFG_DIR -r $REC_CMD \
-                -s $VDRSHUTDOWN -E $EPG_FILE -u $USER -g $GROUP --port $SVDRP_PORT \
-                $OPTIONS $PLUGINS
-    else
-           echo -n " - seems to be running already"
-    fi
+    if [ "$ENABLED" != "0" ]; then
+        # only start vdr if there is no other instance running
+        # (Appears as vdr-kbd in the official debian-packages
+        # and just as vdr in the c't-vdr packages)
+        if ! ps ax | grep "/usr/bin/\(vdr\|vdr-kbd\) " | grep -qv grep
+        then
+                . /usr/lib/vdr/plugin-loader.sh
+                . /usr/lib/vdr/commands-loader.sh
+                getplugins
+                mergecommands "commands"
+                mergecommands "reccmds"
+                start-stop-daemon --start --quiet --background \
+                        --exec /usr/sbin/runvdr -- -v $VIDEO_DIR -c $CFG_DIR -r $REC_CMD \
+                        -s $VDRSHUTDOWN -E $EPG_FILE -u $USER -g $GROUP --port $SVDRP_PORT \
+                        $OPTIONS $PLUGINS
+        else
+                echo -n " - seems to be running already"
+        fi
+     else
+        echo -n " - aborted (to enable the daemon, edit /etc/default/vdr)"
+     fi
 } 
 
 stopvdr()