diff options
Diffstat (limited to 'meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch')
-rw-r--r-- | meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch index 39c3f59cee..0e1d09492b 100644 --- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch +++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.service-the-syslog-ng-service.patch | |||
@@ -1,16 +1,17 @@ | |||
1 | From 0be9c08dd3f825e92fa02d4a08d8aff743109e61 Mon Sep 17 00:00:00 2001 | 1 | Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start |
2 | From: Li xin <lixin.fnst@cn.fujitsu.com> | ||
3 | Date: Wed, 17 Jun 2015 14:46:30 +0900 | ||
4 | Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start | ||
5 | successfully,so modify it. | 2 | successfully,so modify it. |
6 | 3 | ||
7 | Upstream-Status: pending | 4 | Upstream-Status: pending |
8 | 5 | ||
9 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> | 6 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> |
10 | Updated-by: Andrej Valek <andrej.valek@siemens.com> | 7 | Updated-by: Andrej Valek <andrej.valek@siemens.com> |
8 | |||
9 | Update for 3.24.1 | ||
10 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> | ||
11 | --- | 11 | --- |
12 | contrib/systemd/syslog-ng.service | 5 ++--- | 12 | contrib/systemd/syslog-ng@.service | 4 ++-- |
13 | 1 file changed, 2 insertion(+), 3 deletions(-) | 13 | contrib/systemd/syslog-ng@default | 6 +++--- |
14 | 2 files changed, 5 insertions(+), 5 deletions(-) | ||
14 | 15 | ||
15 | diff --git a/contrib/systemd/syslog-ng@.service b/contrib/systemd/syslog-ng@.service | 16 | diff --git a/contrib/systemd/syslog-ng@.service b/contrib/systemd/syslog-ng@.service |
16 | index a28640e..93aec94 100644 | 17 | index a28640e..93aec94 100644 |
@@ -28,19 +29,18 @@ index a28640e..93aec94 100644 | |||
28 | StandardError=journal | 29 | StandardError=journal |
29 | Restart=on-failure | 30 | Restart=on-failure |
30 | diff --git a/contrib/systemd/syslog-ng@default b/contrib/systemd/syslog-ng@default | 31 | diff --git a/contrib/systemd/syslog-ng@default b/contrib/systemd/syslog-ng@default |
31 | index 02da288..3a8215d 100644 | 32 | index 0ccc2b9..7f08c0e 100644 |
32 | --- a/contrib/systemd/syslog-ng@default | 33 | --- a/contrib/systemd/syslog-ng@default |
33 | +++ b/contrib/systemd/syslog-ng@default | 34 | +++ b/contrib/systemd/syslog-ng@default |
34 | @@ -1,5 +1,5 @@ | 35 | @@ -1,5 +1,5 @@ |
35 | -CONFIG_FILE=/etc/syslog-ng.conf | 36 | CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf |
36 | -PERSIST_FILE=/var/lib/syslog-ng/syslog-ng.persist | 37 | -PERSIST_FILE=/var/lib/syslog-ng/syslog-ng.persist |
37 | -CONTROL_FILE=/var/lib/syslog-ng/syslog-ng.ctl | 38 | -CONTROL_FILE=/var/run/syslog-ng.ctl |
38 | -PID_FILE=/var/run/syslog-ng.pid | 39 | -PID_FILE=/var/run/syslog-ng.pid |
39 | +CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf | ||
40 | +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist | 40 | +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist |
41 | +CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl | 41 | +CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl |
42 | +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid | 42 | +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid |
43 | OTHER_OPTIONS="--enable-core" | 43 | OTHER_OPTIONS="--enable-core" |
44 | |||
45 | -- | 44 | -- |
46 | 1.8.4.2 | 45 | 2.7.4 |
46 | |||