diff options
| author |   Joshua Lock <josh@linux.intel.com> | 2012-01-31 16:49:47 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-02 18:28:27 +0000 |
| commit | 5c3323b7e7b71ef83d19f67b8c9c4277cf873cdf (patch) | |
| tree | 2fa80b01da889af72135325f59115d50106a4ba2 /meta/recipes-extended/sysklogd/sysklogd.inc | |
| parent | f408dd164ee4aee7ae0e46392fb088c5263ea81c (diff) | |
| download | openembedded-core-contrib-5c3323b7e7b71ef83d19f67b8c9c4277cf873cdf.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-extended/sysklogd/sysklogd.inc')
| -rw-r--r-- | meta/recipes-extended/sysklogd/sysklogd.inc | 10 |
1 files changed, 6 insertions, 4 deletions
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 } |