From c0945057ff7dd2562f07bb579032218139397729 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Tue, 5 Aug 2014 23:18:56 -0400 Subject: rsyslog: use syslog as the script name of syslog-init Use syslog as the default symlink and INITSCRIPT_NAME just as sysklogd and syslog-ng did. Signed-off-by: Jackie Huang Signed-off-by: Martin Jansa --- meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb index 3bb92fab95..6ee571e890 100644 --- a/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb +++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb @@ -64,14 +64,14 @@ PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,," do_install_append() { install -d "${D}${sysconfdir}/init.d" - install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/rsyslogd + install -m 755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/syslog.${BPN} install -m 644 ${WORKDIR}/rsyslog.conf ${D}${sysconfdir}/rsyslog.conf install -m 644 ${WORKDIR}/rsyslog.logrotate ${D}${sysconfdir}/logrotate.rsyslog } FILES_${PN} += "${bindir}" -INITSCRIPT_NAME = "rsyslogd" +INITSCRIPT_NAME = "syslog" INITSCRIPT_PARAMS = "defaults" # higher than sysklogd's 100 @@ -101,6 +101,5 @@ python () { pn = d.getVar('PN', True) sysconfdir = d.getVar('sysconfdir', True) d.appendVar('ALTERNATIVE_%s' % (pn), ' syslog-init') - d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslogd' % (sysconfdir)) - d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/rsyslogd' % (sysconfdir)) + d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (sysconfdir)) } -- cgit 1.2.3-korg