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