aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2020-03-04 21:51:33 +0100
committerJoerg Bornkessel <hd_brummy@gentoo.org>2020-03-04 21:51:33 +0100
commitf28747d2cb5410be7a34b4ea9e1257df265e28b7 (patch)
treea35df6a3eac2c630a16228b2c44f9350b95bf18d
parentproj/gentoo-vdr-scripts: removed depricated log entry for new svdrp port (diff)
downloadgentoo-vdr-scripts-master.tar.gz
gentoo-vdr-scripts-master.tar.bz2
gentoo-vdr-scripts-master.zip
overlay/vdr/devel: moved homedir /var/vdr to /var/lib/vdrHEADmastergvs-3.x
Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>
-rw-r--r--ChangeLog3
-rw-r--r--Makefile4
-rw-r--r--README.guid-migration1
-rw-r--r--README.shutdown2
-rw-r--r--README.shutdown-jobs2
-rw-r--r--etc/conf.d/vdr2
-rw-r--r--etc/init.d/vdr4
-rw-r--r--etc/vdr/commands/commands.system.conf2
-rw-r--r--etc/vdr/commands/commands.system.conf.de2
-rw-r--r--usr/share/vdr/inc/commands-functions.sh4
-rw-r--r--usr/share/vdr/inc/plugin-functions.sh2
-rw-r--r--usr/share/vdr/inc/shutdown-functions.sh2
-rw-r--r--usr/share/vdr/rcscript/pre-start-30-parameter.sh2
-rw-r--r--usr/share/vdr/rcscript/pre-start-40-config-files.sh8
-rw-r--r--usr/share/vdr/systemd/vdr-systemd_helper.sh2
-rw-r--r--var/lib/vdr/tmp/Makefile (renamed from var/vdr/tmp/Makefile)2
-rw-r--r--var/lib/vdr/tmp/systemd_env (renamed from var/vdr/tmp/systemd_env)0
-rw-r--r--vdrplugin-rebuild/vdrplugin-rebuild4
18 files changed, 26 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index bc0a078..02c1bee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
- removed deprecated logger output for
new svdrp port
+ - moved vdr homedir /var/vdr -> /var/lib/vdr
+ nedded for new acct/{user,group} handling
+ - moved path in all files from /var/vdr -> /var/lib/vdr
*gentoo-vdr-scripts-3.0_rc1 (11 Jan 2020)
diff --git a/Makefile b/Makefile
index 2a4247b..a4550d5 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ SHELL = /bin/bash
SUBDIRS = etc usr vdrplugin-rebuild
-SUBDIRS += usr/lib/systemd/system var/vdr/tmp etc/systemd/system/vdr.service.d
+SUBDIRS += usr/lib/systemd/system var/lib/vdr/tmp etc/systemd/system/vdr.service.d
all:
@@ -20,7 +20,7 @@ install:
@for DIR in $(SUBDIRS); do \
$(MAKE) -C $$DIR install; \
done
- @install -m 0755 -o vdr -g vdr -d $(DESTDIR)/var/vdr/{shutdown-data,merged-config-files}
+ @install -m 0755 -o vdr -g vdr -d $(DESTDIR)/var/lib/vdr/{shutdown-data,merged-config-files}
snapshot:
git archive HEAD | bzip2 gentoo-vdr-scripts-snapshot.tar.bz2
diff --git a/README.guid-migration b/README.guid-migration
new file mode 100644
index 0000000..4653a81
--- /dev/null
+++ b/README.guid-migration
@@ -0,0 +1 @@
+ToDo
diff --git a/README.shutdown b/README.shutdown
index 36ddc47..bcf86a3 100644
--- a/README.shutdown
+++ b/README.shutdown
@@ -94,7 +94,7 @@ void set_retry_time(int time_minutes)
= storage-format for tmp-files:
===============================
-Tmp-files for shutdown are stored under /var/vdr/shutdown-data
+Tmp-files for shutdown are stored under /var/lib/vdr/shutdown-data
All stored times are unix-timestamps
$datadir/shutdown-need-reboot:
diff --git a/README.shutdown-jobs b/README.shutdown-jobs
index af64450..b0f24d8 100644
--- a/README.shutdown-jobs
+++ b/README.shutdown-jobs
@@ -23,7 +23,7 @@ Missing are handlers for epg-update from outside and autotimer-kicking.
This thread runs under a name for which is explicitly checked when shutdown so that
it will not shutdown when it is not finished.
- It writes the time it finished into a file (under /var/vdr/shutdown-data)
+ It writes the time it finished into a file (under /var/lib/vdr/shutdown-data)
When doing shutdown and the last finish-time read from file is not longer ago than XXmin
then it will not be started again and shutdown continues.
diff --git a/etc/conf.d/vdr b/etc/conf.d/vdr
index e00ab13..2698517 100644
--- a/etc/conf.d/vdr
+++ b/etc/conf.d/vdr
@@ -170,7 +170,7 @@ DISPLAY=:0.0
# use DIR as video directory
# allowed values: directory names
# default: /var/vdr/video
-#VIDEO="/var/vdr/video"
+#VIDEO="/var/lib/vdr/video"
# Read config files from DIR
# allowed values: directory names
diff --git a/etc/init.d/vdr b/etc/init.d/vdr
index 4e2aba6..bace11a 100644
--- a/etc/init.d/vdr
+++ b/etc/init.d/vdr
@@ -7,14 +7,14 @@ extra_commands="watchdogrestart"
. /etc/conf.d/vdr.watchdogd
common_init() {
- vdr_home=/var/vdr
+ vdr_home=/var/lib/vdr
cd ${vdr_home}
. /usr/share/vdr/inc/functions.sh
include rc-functions
include plugin-functions
include svdrpcmd
- VDR_LOG_FILE=/var/vdr/tmp/vdr-start-log
+ VDR_LOG_FILE=/var/lib/vdr/tmp/vdr-start-log
}
clear_logfile() {
diff --git a/etc/vdr/commands/commands.system.conf b/etc/vdr/commands/commands.system.conf
index e443db5..e127a71 100644
--- a/etc/vdr/commands/commands.system.conf
+++ b/etc/vdr/commands/commands.system.conf
@@ -1,2 +1,2 @@
-View VDR Start Log: cat /var/vdr/tmp/vdr-start-log
+View VDR Start Log: cat /var/lib/vdr/tmp/vdr-start-log
diff --git a/etc/vdr/commands/commands.system.conf.de b/etc/vdr/commands/commands.system.conf.de
index 65e5742..e144ea8 100644
--- a/etc/vdr/commands/commands.system.conf.de
+++ b/etc/vdr/commands/commands.system.conf.de
@@ -1,2 +1,2 @@
-VDR Start Log Anzeigen: cat /var/vdr/tmp/vdr-start-log
+VDR Start Log Anzeigen: cat /var/lib/vdr/tmp/vdr-start-log
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
diff --git a/var/vdr/tmp/Makefile b/var/lib/vdr/tmp/Makefile
index 3ad46b8..c1eed39 100644
--- a/var/vdr/tmp/Makefile
+++ b/var/lib/vdr/tmp/Makefile
@@ -1,6 +1,6 @@
SHELL = /bin/bash
-MYDIR = $(DESTDIR)/var/vdr/tmp
+MYDIR = $(DESTDIR)/var/lib/vdr/tmp
SUBDIRS =
BINS =
CONFS = systemd_env
diff --git a/var/vdr/tmp/systemd_env b/var/lib/vdr/tmp/systemd_env
index e69de29..e69de29 100644
--- a/var/vdr/tmp/systemd_env
+++ b/var/lib/vdr/tmp/systemd_env
diff --git a/vdrplugin-rebuild/vdrplugin-rebuild b/vdrplugin-rebuild/vdrplugin-rebuild
index 327a2db..17548e5 100644
--- a/vdrplugin-rebuild/vdrplugin-rebuild
+++ b/vdrplugin-rebuild/vdrplugin-rebuild
@@ -35,7 +35,7 @@ R_OPTION_PATCHLEVEL=0;
R_OPTION_PM="portage";
R_PLUGIN_ENABLE="${ROOT}/etc/conf.d/vdr.plugins"
-R_PLUGINS_SKIPPED="${ROOT}/var/vdr/tmp/plugins_skipped_ALL"
+R_PLUGINS_SKIPPED="${ROOT}/var/lib/vdr/tmp/plugins_skipped_ALL"
eerror() {
echo -e "${C_BOLD}${C_RED}** ${@}.${C_NORM}"
@@ -336,7 +336,7 @@ fi
if [[ ${R_OPTION_PATCHLEVEL} == 1 ]]; then
# needed for plugin patchlevel check
vdr_checksum_dir="${vdr_plugin_dir%/plugins}/checksums"
- vdr_checksum=/var/vdr/tmp/rebuild-vdr-checksum
+ vdr_checksum=/var/lib/vdr/tmp/rebuild-vdr-checksum
if ! vdr-get-header-checksum > "${vdr_checksum}"; then
echo -e "${C_BOLD}${C_RED}Could not get vdr header checksum${C_NORM}"
exit 1