overlay/vdr/devel: moved homedir /var/vdr to /var/lib/vdrHEADmaster

Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>

6 files changed, 10 insertions, 10 deletions

diff --git a/usr/share/vdr/inc/commands-functions.sh b/usr/share/vdr/inc/commands-functions.sh
index 31a677a..7d609b1 100644
--- a/usr/share/vdr/inc/commands-functions.sh
+++ b/usr/share/vdr/inc/commands-functions.sh
@@ -1,7 +1,7 @@
 #
 include language-functions
 
-# merging the files under /etc/vdr/commands/ to one single file under /var/vdr/merged-config-files/ and links
+# merging the files under /etc/vdr/commands/ to one single file under /var/lib/vdr/merged-config-files/ and links
 # it to /etc/vdr/commands.conf.
 # This merged file can then be used by the vdr process.
 
@@ -12,7 +12,7 @@ merge_commands_conf() {
 	local sdir="${1}" destfile="${2}" order="${3}"
 
 	local bname=${destfile##*/}
-	local mergedfile="/var/vdr/merged-config-files/${bname}"
+	local mergedfile="/var/lib/vdr/merged-config-files/${bname}"
 
 	# merging files
 	if [ -f "${mergedfile}" ]; then
diff --git a/usr/share/vdr/inc/plugin-functions.sh b/usr/share/vdr/inc/plugin-functions.sh
index 93dd872..b36766c 100644
--- a/usr/share/vdr/inc/plugin-functions.sh
+++ b/usr/share/vdr/inc/plugin-functions.sh
@@ -2,7 +2,7 @@
 # Manages loading of plugins (i.e. creating command-line-options for vdr)
 
 init_tmp_dirs() {
-	PL_TMP=/var/vdr/tmp
+	PL_TMP=/var/lib/vdr/tmp
 	if [ ! -d "${PL_TMP}" ]; then
 		mkdir "${PL_TMP}"
 		chown vdr:vdr "${PL_TMP}"
diff --git a/usr/share/vdr/inc/shutdown-functions.sh b/usr/share/vdr/inc/shutdown-functions.sh
index 2fe29d8..53cfa6c 100644
--- a/usr/share/vdr/inc/shutdown-functions.sh
+++ b/usr/share/vdr/inc/shutdown-functions.sh
@@ -3,6 +3,6 @@
 # Reading of shutdown-config-file and setting some default-values
 #
 
-shutdown_data_dir=/var/vdr/shutdown-data
+shutdown_data_dir=/var/lib/vdr/shutdown-data
 
 . /etc/conf.d/vdr.shutdown
diff --git a/usr/share/vdr/rcscript/pre-start-30-parameter.sh b/usr/share/vdr/rcscript/pre-start-30-parameter.sh
index 84ffdad..5dfd9e0 100644
--- a/usr/share/vdr/rcscript/pre-start-30-parameter.sh
+++ b/usr/share/vdr/rcscript/pre-start-30-parameter.sh
@@ -31,7 +31,7 @@ addon_main() {
 	add_param "--cachedir=${CACHEDIR:-/var/cache/vdr}"
 
 	add_param "--log=${LOG:-1}"
-	[ -z "${VIDEO}" ] && VIDEO="/var/vdr/video"
+	[ -z "${VIDEO}" ] && VIDEO="/var/lib/vdr/video"
 	if [ ! -d "${VIDEO}" ]; then
 		mkdir -p "${VIDEO}"
 		chown vdr:vdr "${VIDEO}"
diff --git a/usr/share/vdr/rcscript/pre-start-40-config-files.sh b/usr/share/vdr/rcscript/pre-start-40-config-files.sh
index 07eeca6..46fcf8c 100644
--- a/usr/share/vdr/rcscript/pre-start-40-config-files.sh
+++ b/usr/share/vdr/rcscript/pre-start-40-config-files.sh
@@ -3,10 +3,10 @@ include commands-functions
 
 addon_main() {
 	ebegin "  Checking config files"
-	if [ ! -d /var/vdr ]; then
-		mkdir -p /var/vdr/{shutdown-data,merged-config-files}
-		chown vdr:vdr -R /var/vdr
-		ewarn "    created /var/vdr"
+	if [ ! -d /var/lib/vdr ]; then
+		mkdir -p /var/lib/vdr/{shutdown-data,merged-config-files}
+		chown vdr:vdr -R /var/lib/vdr
+		ewarn "    created /var/lib/vdr"
 	fi
 	merge_commands_conf /etc/vdr/commands /etc/vdr/commands.conf "${ORDER_COMMANDS}"
 	merge_commands_conf /etc/vdr/reccmds /etc/vdr/reccmds.conf "${ORDER_RECCMDS}"
diff --git a/usr/share/vdr/systemd/vdr-systemd_helper.sh b/usr/share/vdr/systemd/vdr-systemd_helper.sh
index 1003c62..3a54224 100644
--- a/usr/share/vdr/systemd/vdr-systemd_helper.sh
+++ b/usr/share/vdr/systemd/vdr-systemd_helper.sh
@@ -12,7 +12,7 @@
 . /etc/conf.d/vdr.watchdogd
 
 # inspired by the old OpenRC script /etc/init.d/vdr:
-cd /var/vdr
+cd /var/lib/vdr
 unset MAIL
 . /usr/share/vdr/inc/functions.sh