diff options
author | Yu Ke <ke.yu@intel.com> | 2010-10-19 15:15:17 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-19 20:29:59 +0100 |
commit | 4f7d621db6943cd32c7c4ba41a96db72c1d91e4c (patch) | |
tree | 40ca4b3097534aec32a5a5a9d9ae5f2761a7bcaf /meta/recipes-extended/sysklogd/sysklogd.inc | |
parent | c41fe30640fe2f27df8de7b53112bd492cd5468f (diff) | |
download | ast2050-yocto-poky-4f7d621db6943cd32c7c4ba41a96db72c1d91e4c.zip ast2050-yocto-poky-4f7d621db6943cd32c7c4ba41a96db72c1d91e4c.tar.gz |
sysklogd: correct the syslog link and conf file
This commit fix [BUGID #482]
Two issues cause bug 482:
- firsty, there are two version of syslog: sysklogd and busybox.
the busybox one is directly installed as /etc/init.d/syslog,
and the sysklogd one is installed by update-alternative. the
update-alternative will thus fail because the /etc/init.d/syslog
(busybox one) already exist and not a link. so the correct way
is to install busybox one by update-alternative, the layout will be:
/etc/init.d/syslog.busybox
/etc/init.d/syslog.sysklogd
/etc/init.d/syslog -> syslog.busybox or
/etc/init.d/syslog -> syslog.sysklogd
- secondly, sysklogd default conf is not comply with poky. Its dir /var/adm/
does not exist. Check the debian /etc/syslog.conf and find it is more
sophiscated and suitable, so port /etc/syslog.conf from debian.
Signed-off-by: Yu Ke <ke.yu@intel.com>
Diffstat (limited to 'meta/recipes-extended/sysklogd/sysklogd.inc')
-rw-r--r-- | meta/recipes-extended/sysklogd/sysklogd.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index 76ab707..9bd7728 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -18,6 +18,7 @@ RDEPENDS_${PN}_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \ file://no-strip-install.patch \ file://sysklogd \ + file://syslog.conf \ " INITSCRIPT_NAME = "syslog" @@ -33,7 +34,7 @@ do_install () { mv ${D}${base_sbindir}/syslogd ${D}${base_sbindir}/syslogd.${PN} mv ${D}${base_sbindir}/klogd ${D}${base_sbindir}/klogd.${PN} install -d ${D}${sysconfdir} - install -m 644 ${S}/syslog.conf ${D}${sysconfdir}/syslog.conf + install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf install -d ${D}${sysconfdir}/init.d install -m 755 ${WORKDIR}/sysklogd ${D}${sysconfdir}/init.d/syslog.${PN} } |