[oe] [meta-oe][PATCH 1/2] rsyslog: fix configuration file for logrotate
Qi.Chen at windriver.com
Qi.Chen at windriver.com
Fri Aug 3 10:06:44 UTC 2018
From: Chen Qi <Qi.Chen at windriver.com>
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 at windriver.com>
---
meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate | 4 ++--
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 94ec517..5f8568f 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog/rsyslog.logrotate
@@ -9,7 +9,7 @@
delaycompress
compress
postrotate
- /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
+ @BINDIR@/pkill -HUP rsyslogd 2> /dev/null || true
endscript
}
@@ -34,6 +34,6 @@
delaycompress
sharedscripts
postrotate
- /bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true
+ @BINDIR@/pkill -HUP rsyslogd 2> /dev/null || true
endscript
}
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 9737892..d90695a 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() {
install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog
install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf
install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog
+ sed -i -e "s#@BINDIR@#${bindir}#g" ${D}${sysconfdir}/logrotate.d/logrotate.rsyslog
}
FILES_${PN} += "${bindir}"
--
1.9.1
More information about the Openembedded-devel
mailing list