aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2014-08-05 23:18:56 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2014-08-11 11:00:42 +0200
commitc0945057ff7dd2562f07bb579032218139397729 (patch)
tree2d6a078c45dc501600a215a467cbbcdf05e68186
parent80310a34807fd952135c11d15fa245b4d39c0e02 (diff)
downloadmeta-openembedded-contrib-c0945057ff7dd2562f07bb579032218139397729.tar.gz
meta-openembedded-contrib-c0945057ff7dd2562f07bb579032218139397729.tar.bz2
meta-openembedded-contrib-c0945057ff7dd2562f07bb579032218139397729.zip
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 <jackie.huang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb7
1 files 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))
}