aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--etc/conf.d/vdr6
-rw-r--r--usr/share/vdr/rcscript/pre-start-30-parameter.sh2
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f3d2322..da2b0da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gentoo-vdr-scripts
# $Id$
+ 15 Mar 2013; Joerg Bornkessel <hd_brummy@gentoo.org>
+ usr/share/vdr/rcscript/pre-start-30-parameter.sh, bump.sh, etc/conf.d/vdr:
+ better default handling for value EPGFILE, thx to sirwio@vdr-portal.de on
+ #post 1132342
+
*gentoo-vdr-scripts-2.0.0_rc1 (26 Jan 2013)
26 Jan 2013; Joerg Bornkessel <hd_brummy@gentoo.org>
diff --git a/etc/conf.d/vdr b/etc/conf.d/vdr
index 37670ce..f9500f0 100644
--- a/etc/conf.d/vdr
+++ b/etc/conf.d/vdr
@@ -159,8 +159,8 @@ LOG="3"
# if FILE is a directory, the default EPG file will be
# created in that directory
# allowed values: -E-, file/directory names
-# default: -E-
-#EPGFILE="-E-"
+# default: unset, empty string
+#EPGFILE=""
# activate the (internal to vdr) watchdog timer with
# a timeout of SEC seconds (recommended by Klaus Schmidinger)
@@ -225,7 +225,7 @@ PLUGIN_CHECK_PATCHLEVEL="yes"
# allow core-dumps when using setuid
# This helps for debugging crashes
# allowed values: yes no
-# default:no
+# default: no
#ALLOW_USERDUMP="yes"
# for people who really know what they do
diff --git a/usr/share/vdr/rcscript/pre-start-30-parameter.sh b/usr/share/vdr/rcscript/pre-start-30-parameter.sh
index a142ace..63ee1c1 100644
--- a/usr/share/vdr/rcscript/pre-start-30-parameter.sh
+++ b/usr/share/vdr/rcscript/pre-start-30-parameter.sh
@@ -12,7 +12,7 @@ addon_main() {
yesno "${MUTE}" && add_param "--mute"
[ -n "${CONFIG}" ] && add_param "--config=${CONFIG}"
[ -n "${DEVICE}" ] && for i in ${DEVICE}; do add_param "--device=${i}"; done
- add_param "--epgfile=${EPGFILE:--E-}"
+ [ -n "${EPGFILE}" ] && add_param "--epgfile=${EPGFILE}"
add_param "--cachedir=${CACHEDIR:-/var/cache/vdr}"
add_param "--log=${LOG:-1}"
[ -z "${VIDEO}" ] && VIDEO="/var/vdr/video"