summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/sysklogd
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2012-01-31 16:49:47 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-02 18:26:50 +0000
commit111d1b8bb2b89e06091335fff6a917bbd9a1f66e (patch)
tree9f3b1ba19d1f01667afbc42ad65e821e5565b389 /meta/recipes-extended/sysklogd
parentad72484a2783afa948966263629006558fbde476 (diff)
downloadopenembedded-core-111d1b8bb2b89e06091335fff6a917bbd9a1f66e.tar.gz
openembedded-core-111d1b8bb2b89e06091335fff6a917bbd9a1f66e.tar.bz2
openembedded-core-111d1b8bb2b89e06091335fff6a917bbd9a1f66e.zip
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. Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/sysklogd')
-rwxr-xr-xmeta/recipes-extended/sysklogd/files/sysklogd2
-rw-r--r--meta/recipes-extended/sysklogd/files/syslog.conf6
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc10
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd_1.5.bb2
4 files changed, 11 insertions, 9 deletions
diff --git a/meta/recipes-extended/sysklogd/files/sysklogd b/meta/recipes-extended/sysklogd/files/sysklogd
index e0fa7a8e1e..dcbc81e5a5 100755
--- a/meta/recipes-extended/sysklogd/files/sysklogd
+++ b/meta/recipes-extended/sysklogd/files/sysklogd
@@ -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
diff --git a/meta/recipes-extended/sysklogd/files/syslog.conf b/meta/recipes-extended/sysklogd/files/syslog.conf
index 795d73545a..7d1858ca5b 100644
--- a/meta/recipes-extended/sysklogd/files/syslog.conf
+++ b/meta/recipes-extended/sysklogd/files/syslog.conf
@@ -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.
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 0b84dace96..fb2ddb2013 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -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
}
diff --git a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
index 187c9f49b6..b58094e69e 100644
--- a/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
+++ b/meta/recipes-extended/sysklogd/sysklogd_1.5.bb
@@ -1,5 +1,5 @@
require sysklogd.inc
-PR = "r4"
+PR = "r5"
SRC_URI[md5sum] = "e053094e8103165f98ddafe828f6ae4b"
SRC_URI[sha256sum] = "6169b8e91d29288e90404f01462b69e7f2afb1161aa419826fe4736c7f9eb773"