From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 27 Mar 2013 13:57:03 +0000 (+0100)
Subject: vdradmin: Change VDR configuration directory.
X-Git-Tag: v2.13-core68~2^2~18^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ca08d602292f6183bda999df4d62aef86b7e1be;p=ipfire-2.x.git

vdradmin: Change VDR configuration directory.
---

diff --git a/config/vdradmin/install-ipfire.sh b/config/vdradmin/install-ipfire.sh
index 8eceaac186..9a6655b7b7 100755
--- a/config/vdradmin/install-ipfire.sh
+++ b/config/vdradmin/install-ipfire.sh
@@ -18,7 +18,7 @@ CACHEDIR=${CACHEDIR:-$DESTDIR/var/cache/vdradmin}
 PIDFILE=${PIDFILE:-$DESTDIR/var/run/vdradmind.pid}
 VIDEODIR=${VIDEODIR:-/var/video}
 EPGIMAGES=${EPGIMAGES:-$VIDEODIR/epgimages}
-VDRCONF=${VDRCONF:-/opt/vdr/etc}
+VDRCONF=${VDRCONF:-/etc/vdr}
 
 function usage()
 {
diff --git a/config/vdradmin/vdradmind.conf b/config/vdradmin/vdradmind.conf
index 226b9cc27b..a3b2d485a9 100644
--- a/config/vdradmin/vdradmind.conf
+++ b/config/vdradmin/vdradmind.conf
@@ -81,7 +81,7 @@ TV_MIMETYPE = video/x-mpegurl
 TV_SIZE = half
 USERNAME = vdradmin
 USERNAME_GUEST = guest
-VDRCONFDIR = /opt/vdr/etc
+VDRCONFDIR = /etc/vdr
 VDR_HOST = localhost
 VDR_PORT = 6419
 VIDEODIR = /var/video
diff --git a/src/paks/vdradmin/update.sh b/src/paks/vdradmin/update.sh
index ec21a577d7..72d3185448 100644
--- a/src/paks/vdradmin/update.sh
+++ b/src/paks/vdradmin/update.sh
@@ -30,7 +30,8 @@
 stop_service ${NAME}
 
 sed -i /etc/vdradmin/vdradmind.conf \
-	-e "s/^LANG = .*/LANG = en_US.utf8/g" \
-	-e "s/^VDR_PORT = .*/VDR_PORT = 6419/g"
+	-e "s@^LANG = .*@LANG = en_US.utf8@g" \
+	-e "s@^VDR_PORT = .*@VDR_PORT = 6419@g" \
+	-e "s@^VDRCONFDIR = .*@VDRCONFDIR = /etc/vdr@g"
 
 start_service ${NAME}