aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2014-10-18 21:37:12 +0200
committerJoerg Bornkessel <hd_brummy@gentoo.org>2014-10-18 21:37:12 +0200
commitf5a908c07bacf9cf49eecdc12057862f76c6295a (patch)
treec312dfcd5c1c9acdf5c73ef21d374e0125e0a5b5 /etc
parentadded --keep-going to vdrplugin-rebuild; added empty file plugins_skipped_ALL... (diff)
downloadgentoo-vdr-scripts-f5a908c07bacf9cf49eecdc12057862f76c6295a.tar.gz
gentoo-vdr-scripts-f5a908c07bacf9cf49eecdc12057862f76c6295a.tar.bz2
gentoo-vdr-scripts-f5a908c07bacf9cf49eecdc12057862f76c6295a.zip
reverted changes for vdrplugin-rebuild -s paramater; fixed systemd support wrt bug 353492#33 ff, thx to L.Muresan
Diffstat (limited to 'etc')
-rw-r--r--etc/conf.d/vdr6
-rw-r--r--etc/systemd/system/vdr.service.d/00-gentoo-vdr-user.conf22
2 files changed, 15 insertions, 13 deletions
diff --git a/etc/conf.d/vdr b/etc/conf.d/vdr
index b3d76ba..ecfc9f9 100644
--- a/etc/conf.d/vdr
+++ b/etc/conf.d/vdr
@@ -225,6 +225,12 @@ PLUGIN_CHECK_PATCHLEVEL="yes"
# and who want to start vdr as user root
# allowed values: yes no
# default: no
+#
+# WILL BE IGNORED IF USING SYSTEMD !!!
+# Enable the 'User=root' key under the [Service] section in
+# /etc/systemd/system/vdr.service.d/00-gentoo-vdr-user.conf
+# only if you want to run vdr as user root and use systemd
+#
#START_VDR_AS_ROOT="no"
# Use only the given DVB device (NUM = 0, 1, 2...)
diff --git a/etc/systemd/system/vdr.service.d/00-gentoo-vdr-user.conf b/etc/systemd/system/vdr.service.d/00-gentoo-vdr-user.conf
index 98384c2..0164aa4 100644
--- a/etc/systemd/system/vdr.service.d/00-gentoo-vdr-user.conf
+++ b/etc/systemd/system/vdr.service.d/00-gentoo-vdr-user.conf
@@ -3,16 +3,12 @@
#
# use this file to override settings from vdr.service
-## need testing, which one will work
-
-# test1
-#[Service]
-# uncomment this if you have to set START_VDR_AS_ROOT="yes" in /etc/conf.d/vdr
-#User=root
-
-# test2
-# For people who really know what they do
-# and who want to start vdr as user root
-# allowed values: yes no
-# default: no
-#START_VDR_AS_ROOT="no" \ No newline at end of file
+[Service]
+# Uncomment this if you need to run vdr as root.
+# ATTENTION !!!
+# - START_VDR_AS_ROOT from /etc/conf.d/vdr IS IGNORED WHEN USING SYSTEMD !!!
+# - if you use the dbus2vdr plugin, the user who owns the vdr-dbus-service
+# has to also be set in /etc/dbus-1/system.d/de.tvdr.vdr.conf as root if
+# you uncomment the line below
+#
+#User=root \ No newline at end of file