From: pavel <pavel.github@outlook.com>
Date: Sat, 9 Apr 2016 10:37:12 +0000 (-0400)
Subject: Removed 'netdata' folder in service files
X-Git-Tag: v1.1.0~39^2
X-Git-Url: https://arthur.barton.de/gitweb/?p=netdata.git;a=commitdiff_plain;h=7c0958c614591ce69490af74f9f530d71805dc85

Removed 'netdata' folder in service files
---

diff --git a/system/netdata-openrc.in b/system/netdata-openrc.in
index 3b747fcb..f5995501 100755
--- a/system/netdata-openrc.in
+++ b/system/netdata-openrc.in
@@ -22,7 +22,7 @@
 : ${NETDATA_START_AFTER_SERVICES:=apache2 squid nginx mysql named opensips upsd hostapd postfix lm_sensors}
 
 extra_started_commands="getconf"
-pidfile="/run/netdata/netdata.pid"
+pidfile="/run/netdata.pid"
 command="${NETDATA_INSTALL_PATH}/usr/sbin/netdata"
 command_background="yes"
 command_args="-pidfile ${pidfile} ${NETDATA_EXTRA_ARGS}"
@@ -36,11 +36,6 @@ depend() {
 	checkpath -o ${NETDATA_OWNER} -d @localstatedir_POST@/cache/netdata /run/netdata
 }
 
-start_pre() {
-	piddir=$(dirname ${pidfile})
-	mkdir -p ${piddir}
-}
-
 start_post() {
 	if [[ ! -f @sysconfdir_POST@/netdata/netdata.conf ]]; then
 		ebegin "Downloading default configuration to @sysconfdir_POST@/netdata/netdata.conf"
diff --git a/system/netdata.service.in b/system/netdata.service.in
index fc5866c5..e26068d2 100644
--- a/system/netdata.service.in
+++ b/system/netdata.service.in
@@ -7,9 +7,8 @@ Type=forking
 WorkingDirectory=/tmp
 User=root
 Group=root
-PIDFile=@localstatedir_POST@/run/netdata/netdata.pid
-ExecStartPre=/usr/bin/mkdir -p @localstatedir_POST@/run/netdata
-ExecStart=@sbindir_POST@/netdata -pidfile @localstatedir_POST@/run/netdata/netdata.pid
+PIDFile=@localstatedir_POST@/run/netdata.pid
+ExecStart=@sbindir_POST@/netdata -pidfile @localstatedir_POST@/run/netdata.pid
 ExecStop=/bin/kill -SIGTERM $MAINPID
 TimeoutStopSec=30