aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2014-11-28 00:57:36 +0100
committerJoerg Bornkessel <hd_brummy@gentoo.org>2014-11-28 00:57:36 +0100
commitcc3c7ca532884a4c2499fbfe584c5defcbdad598 (patch)
treec0b2c23324a93e32dc78d34c62f3dc2599b99896
parentwrt bug 530828, services misusing 'need net' (diff)
downloadgentoo-vdr-scripts-cc3c7ca532884a4c2499fbfe584c5defcbdad598.tar.gz
gentoo-vdr-scripts-cc3c7ca532884a4c2499fbfe584c5defcbdad598.tar.bz2
gentoo-vdr-scripts-cc3c7ca532884a4c2499fbfe584c5defcbdad598.zip
systemd readme, written by L.Muresan; added L.Muresan as maintainer for systemd support
-rw-r--r--ChangeLog5
-rw-r--r--README1
-rw-r--r--README.systemd28
-rw-r--r--etc/conf.d/vdr4
-rw-r--r--etc/systemd/system/vdr.service.d/00-gentoo-vdr-user.conf8
5 files changed, 35 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a907e7..341d7e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gentoo-vdr-scripts
# $Id$
+ 27 Nov 2014; Joerg Bornkessel <hd_brummy@gentoo.org> README, README.systemd,
+ etc/conf.d/vdr, etc/systemd/system/vdr.service.d/00-gentoo-vdr-user.conf:
+ systemd readme, written by L.Muresan; added L.Muresan as maintainer for
+ systemd support
+
27 Nov 2014; Joerg Bornkessel <hd_brummy@gentoo.org> etc/init.d/vdr:
wrt bug 530828, services misusing 'need net'
diff --git a/README b/README
index ee0804e..f644477 100644
--- a/README
+++ b/README
@@ -13,3 +13,4 @@ Dependencies:
Author:
Matthias Schwarzott <zzam@gentoo.org>
Joerg Bornkessel <hd_brummy@gentoo.org>
+ Lucian Muresan <lucianm@users.sourceforge.net> ( systemd support ) \ No newline at end of file
diff --git a/README.systemd b/README.systemd
index a96ef2c..6fd57a3 100644
--- a/README.systemd
+++ b/README.systemd
@@ -1,3 +1,29 @@
# $Id: $
-ToDo
+Instructions for usage and configuration with systemd
+
+
+Systemd support has been implemented by re-using all the OpenRC configuration
+files of VDR and its plugins located under /etc/conf.d/ even if OpenRC is not installed
+at all.
+
+However, there is one thing which is configured differently, and this is the user under
+which the VDR daemon will run. Just as when running under OpenRC, the gentoo-vdr-scripts
+can be configured to run VDR either as user 'vdr' or as user 'root'. The difference is that
+under systemd, the setting START_VDR_AS_ROOT in /etc/conf.d/vdr is ignored on purpose, to let
+the configuration be done "the systemd way".
+ - The default is to run as user 'vdr'. If running as 'root' is desired, uncomment the 'User=root'
+ key under the [Service] section in the file
+ /etc/systemd/system/vdr.service.d/00-gentoo-vdr-user.conf
+ - *If* the plugin 'dbus2vdr' is used, the user who owns the vdr-dbus-service also has to be set to
+ 'root' in /etc/dbus-1/system.d/de.tvdr.vdr.conf if running VDR as user 'root';
+
+
+
+Finally, in order to start the VDR daemon under systemd manually, execute:
+
+systemctl start vdr
+
+and if the deamon should be started on every bootup of the system, it has to be enabled:
+
+systemctl enable vdr
diff --git a/etc/conf.d/vdr b/etc/conf.d/vdr
index ecfc9f9..ef0b8e1 100644
--- a/etc/conf.d/vdr
+++ b/etc/conf.d/vdr
@@ -227,9 +227,7 @@ PLUGIN_CHECK_PATCHLEVEL="yes"
# 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
+# Please consult README.systemd for further details
#
#START_VDR_AS_ROOT="no"
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 0164aa4..669884b 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
@@ -4,11 +4,5 @@
# use this file to override settings from vdr.service
[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
-#
+# Please consult README.systemd for further details
#User=root \ No newline at end of file