Gitiles
Code Review Sign In
gerrit.openbmc.org / mdmillerii / openbmc / 2f9739240bcb1cfd0675bbe77c02b5f7c32219b1 / . / meta-openembedded / meta-oe / recipes-support / syslog-ng / files / syslog-ng.service-the-syslog-ng-service.patch
blob: 0e1d09492b05a41b4df6e8560cd63bcf34871e0a [file] [log] [blame]
Brad Bishop2f973922019-11-11 07:58:48 -0500[diff] [blame^]1Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]2 successfully,so modify it.
3
4Upstream-Status: pending
5
6Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]7Updated-by: Andrej Valek <andrej.valek@siemens.com>
Brad Bishop2f973922019-11-11 07:58:48 -0500[diff] [blame^]8
9Update for 3.24.1
10Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]11---
Brad Bishop2f973922019-11-11 07:58:48 -0500[diff] [blame^]12 contrib/systemd/syslog-ng@.service | 4 ++--
13 contrib/systemd/syslog-ng@default | 6 +++---
14 2 files changed, 5 insertions(+), 5 deletions(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]15
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]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
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]21 Type=notify
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]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
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]25-ExecReload=/bin/kill -HUP $MAINPID
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]26+ExecStart=@SBINDIR@/syslog-ng -F $OTHER_OPTIONS --cfgfile $CONFIG_FILE --control $CONTROL_FILE --persist-file $PERSIST_FILE --pidfile $PID_FILE
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]27+ExecReload=@BASEBINDIR@/kill -HUP $MAINPID
28 StandardOutput=journal
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]29 StandardError=journal
30 Restart=on-failure
31diff --git a/contrib/systemd/syslog-ng@default b/contrib/systemd/syslog-ng@default
Brad Bishop2f973922019-11-11 07:58:48 -0500[diff] [blame^]32index 0ccc2b9..7f08c0e 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]33--- a/contrib/systemd/syslog-ng@default
34+++ b/contrib/systemd/syslog-ng@default
35@@ -1,5 +1,5 @@
Brad Bishop2f973922019-11-11 07:58:48 -0500[diff] [blame^]36 CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]37-PERSIST_FILE=/var/lib/syslog-ng/syslog-ng.persist
Brad Bishop2f973922019-11-11 07:58:48 -0500[diff] [blame^]38-CONTROL_FILE=/var/run/syslog-ng.ctl
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]39-PID_FILE=/var/run/syslog-ng.pid
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]40+PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist
41+CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl
42+PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid
43 OTHER_OPTIONS="--enable-core"
Patrick Williamsb48b7b42016-08-17 15:04:38 -0500[diff] [blame]44--
Brad Bishop2f973922019-11-11 07:58:48 -0500[diff] [blame^]452.7.4
46