summaryrefslogtreecommitdiff
path: root/meta/recipes-extended/sysklogd/files
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/files
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/files')
-rwxr-xr-xmeta/recipes-extended/sysklogd/files/sysklogd2
-rw-r--r--meta/recipes-extended/sysklogd/files/syslog.conf6
2 files changed, 4 insertions, 4 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.