1Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start
2 successfully,so modify it.
3
4Upstream-Status: Pending
5
6Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
7Updated-by: Andrej Valek <andrej.valek@siemens.com>
8
9Update for 3.24.1
10Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
11---
12 contrib/systemd/syslog-ng@.service | 4 ++--
13 contrib/systemd/syslog-ng@default  | 6 +++---
14 2 files changed, 5 insertions(+), 5 deletions(-)
15
16diff --git a/contrib/systemd/syslog-ng@.service b/contrib/systemd/syslog-ng@.service
17index a28640e..93aec94 100644
18--- a/contrib/systemd/syslog-ng@.service
19+++ b/contrib/systemd/syslog-ng@.service
20@@ -7,8 +7,8 @@ Conflicts=emergency.service emergency.target
21 Type=notify
22 EnvironmentFile=-/etc/default/syslog-ng@%i
23 EnvironmentFile=-/etc/sysconfig/syslog-ng@%i
24-ExecStart=/usr/sbin/syslog-ng -F $OTHER_OPTIONS --cfgfile $CONFIG_FILE --control $CONTROL_FILE --persist-file $PERSIST_FILE --pidfile $PID_FILE
25-ExecReload=/bin/kill -HUP $MAINPID
26+ExecStart=@SBINDIR@/syslog-ng -F $OTHER_OPTIONS --cfgfile $CONFIG_FILE --control $CONTROL_FILE --persist-file $PERSIST_FILE --pidfile $PID_FILE
27+ExecReload=@BASEBINDIR@/kill -HUP $MAINPID
28 StandardOutput=journal
29 StandardError=journal
30 Restart=on-failure
31diff --git a/contrib/systemd/syslog-ng@default b/contrib/systemd/syslog-ng@default
32index 0ccc2b9..7f08c0e 100644
33--- a/contrib/systemd/syslog-ng@default
34+++ b/contrib/systemd/syslog-ng@default
35@@ -1,5 +1,5 @@
36 CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf
37-PERSIST_FILE=/var/lib/syslog-ng/syslog-ng.persist
38-CONTROL_FILE=/var/run/syslog-ng.ctl
39-PID_FILE=/var/run/syslog-ng.pid
40+PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist
41+CONTROL_FILE=@LOCALSTATEDIR@/run/syslog-ng/syslog-ng.ctl
42+PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid
43 OTHER_OPTIONS="--enable-core"
44--
452.7.4
46
47