diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2018-07-30 18:16:56 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-08-02 02:12:15 -0700 |
commit | 1993b1f78cc317ce53c3ff46ef14a8744d701537 (patch) | |
tree | 4001dec7f05542ffd89a0868d6eb5ea345ab7654 | |
parent | a79ca6831128ee99806f4f68a239d17ca6555d88 (diff) | |
download | meta-openembedded-1993b1f78cc317ce53c3ff46ef14a8744d701537.tar.gz |
rsyslog: fix configuration file for logrotate
The logrotate.rsyslog file uses 'cat /var/run/rsyslogd.pid' to
determine the pid of rsyslogd daemon. This is incorrect, because
rsyslogd may start in a way that does not create rsyslog.pid file.
Failing to send HUP signal to rsyslogd daemon will result in
unexpected behaviour. e.g. rsyslogd is writing to /var/log/messages-xxxx
instead of /var/log/messages.
We should really use pkill to send HUP signal to rsyslogd to ensure
correct behaviour.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate | 4 | ||||
-rw-r--r-- | meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate index 94ec517b2..5f8568fce 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate +++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate | |||
@@ -9,7 +9,7 @@ | |||
9 | delaycompress | 9 | delaycompress |
10 | compress | 10 | compress |
11 | postrotate | 11 | postrotate |
12 | /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true | 12 | @BINDIR@/pkill -HUP rsyslogd 2> /dev/null || true |
13 | endscript | 13 | endscript |
14 | } | 14 | } |
15 | 15 | ||
@@ -34,6 +34,6 @@ | |||
34 | delaycompress | 34 | delaycompress |
35 | sharedscripts | 35 | sharedscripts |
36 | postrotate | 36 | postrotate |
37 | /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true | 37 | @BINDIR@/pkill -HUP rsyslogd 2> /dev/null || true |
38 | endscript | 38 | endscript |
39 | } | 39 | } |
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb index 973789201..d90695a60 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_8.36.0.bb | |||
@@ -125,6 +125,7 @@ do_install_append() { | |||
125 | install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog | 125 | install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog |
126 | install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf | 126 | install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf |
127 | install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog | 127 | install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog |
128 | sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog | ||
128 | } | 129 | } |
129 | 130 | ||
130 | FILES_${PN} += "${bindir}" | 131 | FILES_${PN} += "${bindir}" |