vdradmin: Change VDR configuration directory.

diff --git a/config/vdradmin/install-ipfire.sh b/config/vdradmin/install-ipfire.sh
index 8eceaac1869f791c635d0751ebfbd38b538d2948..9a6655b7b7a2d1b6749af17fb6d5bd50d0679a0b 100755 (executable)
--- 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}
 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()
 {
 
 function usage()
 {

diff --git a/config/vdradmin/vdradmind.conf b/config/vdradmin/vdradmind.conf
index 226b9cc27bf5c348300454b1110c11947f1387c3..a3b2d485a9c68e4a4fd6643f74c5b1419b0212d9 100644 (file)
--- 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
 TV_SIZE = half
 USERNAME = vdradmin
 USERNAME_GUEST = guest

-VDRCONFDIR = /opt/vdr/etc
+VDRCONFDIR = /etc/vdr

 VDR_HOST = localhost
 VDR_PORT = 6419
 VIDEODIR = /var/video
 VDR_HOST = localhost
 VDR_PORT = 6419
 VIDEODIR = /var/video

diff --git a/src/paks/vdradmin/update.sh b/src/paks/vdradmin/update.sh
index ec21a577d75d76094e80b8f2104649a4e2753c45..72d3185448af2212994a5b8c3b57d09996b046ef 100644 (file)
--- 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 \
 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}
 
 start_service ${NAME}