sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

sysklogd: various fixes so it starts/stops cleanly 

This patch fixes several issues with the sysklogd recipe:
o Errors at start due to non-existent /var/log/news/ - every other log
  file is created in /var/log, not a sub-directory. Do the same for news
  logs.
o klogd would not be stopped due to pidfile recycling, give klogd its own
  pidfile
o preinstalls failed at rootfs creation time by trying to access the host
  root filesystem rather than a path relative to $D. Update the preinst to
  test for $D and do the right thing.

(From OE-Core rev: 111d1b8bb2b89e06091335fff6a917bbd9a1f66e)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joshua Lock 2012-01-31 16:49:47 -08:00 committed by Richard Purdie
parent f408dd164e
commit 5c3323b7e7
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-extended/sysklogd/files/sysklogd
View File

@ -15,7 +15,7 @@
PATH=/bin:/usr/bin:/sbin:/usr/sbin
pidfile_syslogd=/var/run/syslogd.pid
pidfile_klogd=/var/run/syslogd.pid
pidfile_klogd=/var/run/klogd.pid
binpath_syslogd=/sbin/syslogd
binpath_klogd=/sbin/klogd

6
meta/recipes-extended/sysklogd/files/syslog.conf
View File

@ -26,9 +26,9 @@ mail.err /var/log/mail.err
# Logging for INN news system
#
news.crit /var/log/news/news.crit
news.err /var/log/news/news.err
news.notice -/var/log/news/news.notice
news.crit /var/log/news.crit
news.err /var/log/news.err
news.notice -/var/log/news.notice
#
# Some `catch-all' logfiles.

10
meta/recipes-extended/sysklogd/sysklogd.inc
View File

@ -46,12 +46,14 @@ do_install () {
pkg_preinst_${PN} () {
# all this is needed to avoid sysmlink errors,
# because update-rc.d runs before pkg_postinst
if [ -e ${sysconfdir}/init.d/syslog -a ! -L ${sysconfdir}/init.d/syslog ]; then
ETC=$D${sysconfdir}
if [ -e $ETC/init.d/syslog -a ! -L $ETC/init.d/syslog ]; then
echo "WARNING:" "non symlink ${sysconfdir}/init.d/syslog exist -> backup to ${sysconfdir}/init.d/syslog.old"
mv ${sysconfdir}/init.d/syslog ${sysconfdir}/init.d/syslog.old
mv $ETC/init.d/syslog $ETC/init.d/syslog.old
fi
if [ ! -e ${sysconfdir}/init.d/syslog ]; then
ln -s dummy ${sysconfdir}/init.d/syslog
if [ ! -e $ETC/init.d/syslog ]; then
ln -s dummy $ETC/init.d/syslog
fi
}

2
meta/recipes-extended/sysklogd/sysklogd_1.5.bb
View File

@ -1,5 +1,5 @@
require sysklogd.inc
PR = "r4"
PR = "r5"
SRC_URI[md5sum] = "e053094e8103165f98ddafe828f6ae4b"
SRC_URI[sha256sum] = "6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773"