r1206 - vdr/vdr-xxv/trunk/debian

[Tobias Grimm]

Author: tiber-guest
Date: 2005-09-06 15:48:48 +0000 (Tue, 06 Sep 2005)
New Revision: 1206

Modified:
   vdr/vdr-xxv/trunk/debian/changelog
   vdr/vdr-xxv/trunk/debian/init
Log:
Display message if daemon is disabled


Modified: vdr/vdr-xxv/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv/trunk/debian/changelog	2005-09-06 12:20:47 UTC (rev 1205)
+++ vdr/vdr-xxv/trunk/debian/changelog	2005-09-06 15:48:48 UTC (rev 1206)
@@ -1,3 +1,9 @@
+vdr-xxv (0.42-4) unstable; urgency=low
+
+  * Display message if daemon is disabled
+
+ -- Tobias Grimm <tg at e-tobi.net>  Tue,  6 Sep 2005 17:55:02 +0200
+
 vdr-xxv (0.42-3) unstable; urgency=low
 
   * Tobias Grimm <tg at e-tobi.net>

Modified: vdr/vdr-xxv/trunk/debian/init
===================================================================
--- vdr/vdr-xxv/trunk/debian/init	2005-09-06 12:20:47 UTC (rev 1205)
+++ vdr/vdr-xxv/trunk/debian/init	2005-09-06 15:48:48 UTC (rev 1206)
@@ -31,9 +31,6 @@
     . /etc/default/vdr-xxv
 fi
 
-test "$ENABLED" != "0" || exit 0
-
-
 #
 # Command line options for xxvd - you normally shouldn't touch this!
 #
@@ -71,9 +68,13 @@
 #
 start()
 {
-    init_language_environment
-    LANG=$LANG start-stop-daemon --start --pidfile $PIDFILE  --nicelevel 19 \
-      -c $USER:$GROUP --exec $DAEMON -- $COMMANDLINE
+    if [ "$ENABLED" != "0" ] ; then
+        init_language_environment
+        LANG=$LANG start-stop-daemon --start --pidfile $PIDFILE --nicelevel 19 \
+          -c $USER:$GROUP --exec $DAEMON -- $COMMANDLINE
+    else
+        echo -n " - aborted (to enable the daemon, edit /etc/default/vdr-xxv)"
+    fi
 }