r480 - vdr/vdr/trunk/debian

[Darren Salt]

Author: dsalt-guest
Date: 2005-04-18 22:53:51 +0000 (Mon, 18 Apr 2005)
New Revision: 480

Modified:
   vdr/vdr/trunk/debian/runvdr
   vdr/vdr/trunk/debian/vdr.default
Log:
Add support for enabling NPTL. Untested.
Address bug 305098 (LD_ASSUME_KERNEL on amd64). Unable to test.


Modified: vdr/vdr/trunk/debian/runvdr
===================================================================
--- vdr/vdr/trunk/debian/runvdr	2005-04-18 22:29:29 UTC (rev 479)
+++ vdr/vdr/trunk/debian/runvdr	2005-04-18 22:53:51 UTC (rev 480)
@@ -5,7 +5,11 @@
 . /usr/lib/vdr/config-loader.sh
 
 OPTIONS="$*"
-VDRCMD="LD_ASSUME_KERNEL=2.4 /usr/bin/vdr $OPTIONS"
+if [ "$NONPTL" = "1" -a `uname -m` != x86_64 ]; then
+  VDRCMD="LD_ASSUME_KERNEL=2.4 /usr/bin/vdr $OPTIONS"
+else
+  VDRCMD="/usr/bin/vdr $OPTIONS"
+fi
 
 function get_modulenames ()
 {

Modified: vdr/vdr/trunk/debian/vdr.default
===================================================================
--- vdr/vdr/trunk/debian/vdr.default	2005-04-18 22:29:29 UTC (rev 479)
+++ vdr/vdr/trunk/debian/vdr.default	2005-04-18 22:53:51 UTC (rev 480)
@@ -24,3 +24,8 @@
 # pressed after processing all shutdown hook scripts. Shutdown hooks
 # may override this command - see /usr/share/doc/vdr/README.Debian.
 SHUTDOWNCMD="/etc/init.d/vdr stop ; sleep 1 ; /sbin/shutdown -h now"
+
+# Change this to 0 if you want to allow VDR to use NPTL (if available).
+# This is disabled by default, although it should be safe to enable it.
+# (This has no effect on AMD64 machines.)
+NONPTL=1