| 1 |
Author: hd_brummy |
| 2 |
Date: 2010-09-06 15:24:46 +0000 (Mon, 06 Sep 2010) |
| 3 |
New Revision: 669 |
| 4 |
|
| 5 |
Modified: |
| 6 |
gentoo-vdr-scripts/trunk/ChangeLog |
| 7 |
gentoo-vdr-scripts/trunk/etc/conf.d/vdr |
| 8 |
gentoo-vdr-scripts/trunk/usr/share/vdr/inc/rc-functions.sh |
| 9 |
gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/post-start-50-svdrp.sh |
| 10 |
gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/pre-start-30-parameter.sh |
| 11 |
Log: |
| 12 |
fixed syntax error |
| 13 |
|
| 14 |
Modified: gentoo-vdr-scripts/trunk/ChangeLog |
| 15 |
=================================================================== |
| 16 |
--- gentoo-vdr-scripts/trunk/ChangeLog 2010-09-05 18:19:03 UTC (rev 668) |
| 17 |
+++ gentoo-vdr-scripts/trunk/ChangeLog 2010-09-06 15:24:46 UTC (rev 669) |
| 18 |
@@ -1,6 +1,12 @@ |
| 19 |
# ChangeLog for gentoo-vdr-scripts |
| 20 |
# $Id$ |
| 21 |
|
| 22 |
+ 06 Sep 2010; Joerg Bornkessel <hd_brummy@g.o> |
| 23 |
+ usr/share/vdr/rcscript/pre-start-30-parameter.sh, |
| 24 |
+ usr/share/vdr/rcscript/post-start-50-svdrp.sh, etc/conf.d/vdr, |
| 25 |
+ usr/share/vdr/inc/rc-functions.sh: |
| 26 |
+ fix syntax error |
| 27 |
+ |
| 28 |
*gentoo-vdr-scripts-0.4.7 (05 Sep 2010) |
| 29 |
|
| 30 |
23 Feb 2010; Matthias Schwarzott <zzam@g.o> |
| 31 |
|
| 32 |
Modified: gentoo-vdr-scripts/trunk/etc/conf.d/vdr |
| 33 |
=================================================================== |
| 34 |
--- gentoo-vdr-scripts/trunk/etc/conf.d/vdr 2010-09-05 18:19:03 UTC (rev 668) |
| 35 |
+++ gentoo-vdr-scripts/trunk/etc/conf.d/vdr 2010-09-06 15:24:46 UTC (rev 669) |
| 36 |
@@ -172,10 +172,10 @@ |
| 37 |
# (up to vdr-1.3.36-r2: use what was selected by use-flag) |
| 38 |
#VFAT_FILENAMES="yes" |
| 39 |
|
| 40 |
-# use PORT for SVDRP (default: 2001) |
| 41 |
+# use PORT for SVDRP (default: 2001) (>=vdr-1.7.15 default: 6419) |
| 42 |
# 0 turns off SVDRP |
| 43 |
# allowed values: numbers for ports between 1024 and 65535 |
| 44 |
-# default: 2001 |
| 45 |
+# default: 2001 / 6419 |
| 46 |
#SVDRP_PORT="2001" |
| 47 |
|
| 48 |
# seconds to wait for a running vdr |
| 49 |
|
| 50 |
Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/inc/rc-functions.sh |
| 51 |
=================================================================== |
| 52 |
--- gentoo-vdr-scripts/trunk/usr/share/vdr/inc/rc-functions.sh 2010-09-05 18:19:03 UTC (rev 668) |
| 53 |
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/inc/rc-functions.sh 2010-09-06 15:24:46 UTC (rev 669) |
| 54 |
@@ -31,6 +31,13 @@ |
| 55 |
[ -z "${VDR_BIN}" ] && VDR_BIN=/usr/bin/vdr |
| 56 |
getvdrversion |
| 57 |
|
| 58 |
+getvdrversnum() |
| 59 |
+{ |
| 60 |
+ local include_dir=/usr/include/vdr |
| 61 |
+ VDRVERSNUM=$(awk '/define VDRVERSNUM/ {print $3}' ${include_dir}/config.h) |
| 62 |
+} |
| 63 |
+getvdrversnum |
| 64 |
+ |
| 65 |
init_params() |
| 66 |
{ |
| 67 |
# init variables for vdr/daemonctrl parameters |
| 68 |
|
| 69 |
Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/post-start-50-svdrp.sh |
| 70 |
=================================================================== |
| 71 |
--- gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/post-start-50-svdrp.sh 2010-09-05 18:19:03 UTC (rev 668) |
| 72 |
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/post-start-50-svdrp.sh 2010-09-06 15:24:46 UTC (rev 669) |
| 73 |
@@ -1,9 +1,18 @@ |
| 74 |
# $Id$ |
| 75 |
+ |
| 76 |
+include rc-functions |
| 77 |
+ |
| 78 |
addon_main() { |
| 79 |
# we already know vdr failed |
| 80 |
[ "${vdr_start_failed}" = "1" ] && return 0 |
| 81 |
|
| 82 |
- SVDRP_PORT="${SVDRP_PORT:-2001}" |
| 83 |
+ if [ "${VDRVERSNUM}" -ge "10715" ]; then |
| 84 |
+ SVDRP_PORT="${SVDRP_PORT:-6419}" |
| 85 |
+ logger -t vdr "New default svdrp port 6419!" |
| 86 |
+ else |
| 87 |
+ SVDRP_PORT="${SVDRP_PORT:-2001}" |
| 88 |
+ fi |
| 89 |
+ |
| 90 |
SVDRP_HOSTNAME="${SVDRP_HOSTNAME:-localhost}" |
| 91 |
[ "${SVDRP_PORT}" = "0" ] && return 0 |
| 92 |
|
| 93 |
|
| 94 |
Modified: gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/pre-start-30-parameter.sh |
| 95 |
=================================================================== |
| 96 |
--- gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/pre-start-30-parameter.sh 2010-09-05 18:19:03 UTC (rev 668) |
| 97 |
+++ gentoo-vdr-scripts/trunk/usr/share/vdr/rcscript/pre-start-30-parameter.sh 2010-09-06 15:24:46 UTC (rev 669) |
| 98 |
@@ -29,7 +29,7 @@ |
| 99 |
if [ -n "${CAP_IRCTRL_RUNTIME_PARAM}" ] && [ -n "${IR_CTRL}" ]; then |
| 100 |
case "${IR_CTRL}" in |
| 101 |
lirc) if [ -e /var/run/lirc/lircd ]; then |
| 102 |
- add_param "--lirc=/var/run/lirc/lircd" ;; |
| 103 |
+ add_param "--lirc=/var/run/lirc/lircd" |
| 104 |
else |
| 105 |
add_param "--lirc=/dev/lircd" |
| 106 |
fi |
Archives