Changed default .pid path from /var/run/tvheadend.pid to /run/tvheadend.pid to follow...

diff --git a/debian/tvheadend.service b/debian/tvheadend.service
index 74aaaac7bfa5f8e622f5ba98464594da9d14e122..f0fee349f4d416f929917e40781cb7ccc57ea3d9 100644 (file)
--- a/debian/tvheadend.service
+++ b/debian/tvheadend.service
@@ -9,8 +9,8 @@ After=auditd.service syslog.target network.target local-fs.target
 
 [Service]
 EnvironmentFile=/etc/default/tvheadend
-ExecStart=/usr/bin/tvheadend -f -p /var/run/tvheadend.pid $OPTIONS
-PIDFile=/var/run/tvheadend.pid
+ExecStart=/usr/bin/tvheadend -f -p /run/tvheadend.pid $OPTIONS
+PIDFile=/run/tvheadend.pid
 Type=forking
 Restart=on-failure
 RestartSec=54s

diff --git a/man/tvheadend.1 b/man/tvheadend.1
index 669b3d4435166661f9cf4df0686cba9da4b34d75..fff88e9976f50e9a7b3fca2a02ed9bf8aca1836c 100644 (file)
--- a/man/tvheadend.1
+++ b/man/tvheadend.1
@@ -45,7 +45,7 @@ use the uid of 1 ('daemon' on most systems).
 Run as group \fR\fIgroupname\fR. Only applicable if daemonizing. Default is to use the 'video' group. If the 'video' group does not exist, gid 1 ('daemon') will be used.
 .TP
 \fB\-p\fR \fIpidpath\fR, \fB\-\-pid \fR\fIpidpath\fR
-Specify alternative PID path file (default /var/run/tvheadend.pid).
+Specify alternative PID path file (default /run/tvheadend.pid).
 .TP
 \fB\-C\fR, \fB\-\-firstrun\fR
 If no user account exist then create one with no username and no
@@ -196,7 +196,7 @@ is run as a system daemon a dedicated user needs to be created and Tvheadend
 should be launched with the '-u' argument. Also notice that XMLTV will read/
 store cache and configuration from the same user home directory.
 .PP
-If daemonizing, Tvheadend will writes its pid in /var/run/tvheadend.pid
+If daemonizing, Tvheadend will writes its pid in /run/tvheadend.pid
 .SH "AUTHOR"
 .B Tvheadend
 and this man page is maintained by the Tvheadend team. Please see the 

diff --git a/rpm/tvheadend.service b/rpm/tvheadend.service
index bdcd7270ec7e65dc4f1f0bfc61d4f74dd0c5ed27..c2ae8663ff3d444f9cf1871bc1af5c195f93a7ca 100644 (file)
--- a/rpm/tvheadend.service
+++ b/rpm/tvheadend.service
@@ -9,8 +9,8 @@ After=auditd.service syslog.target network.target local-fs.target
 
 [Service]
 EnvironmentFile=/etc/sysconfig/tvheadend
-ExecStart=/usr/bin/tvheadend -f -p /var/run/tvheadend.pid $OPTIONS
-PIDFile=/var/run/tvheadend.pid
+ExecStart=/usr/bin/tvheadend -f -p /run/tvheadend.pid $OPTIONS
+PIDFile=/run/tvheadend.pid
 Type=forking
 Restart=on-failure
 RestartSec=54s

diff --git a/src/main.c b/src/main.c
index feb8e30251d72ee3c8a0d5e992db4fd2d4278897..c10392a5ae16f612ad870aa013bfdd30dfb1a819 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -862,7 +862,7 @@ main(int argc, char **argv)
              *opt_logpath      = NULL,
              *opt_log_debug    = NULL,
              *opt_log_trace    = NULL,
-             *opt_pidpath      = "/var/run/tvheadend.pid",
+             *opt_pidpath      = "/run/tvheadend.pid",
 #if ENABLE_LINUXDVB
              *opt_dvb_adapters = NULL,
 #endif