From: Jackie Huang <jackie.huang@windriver.com>
Date: Wed, 6 Aug 2014 03:18:56 +0000 (-0400)
Subject: rsyslog: use syslog as the script name of syslog-init
X-Git-Tag: rev_ivi_2015_02_04~1539
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d561f3b2215e4b50233432bf4762a426ec12ee7e;p=scm%2Fbb%2Ftizen-distro.git

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.

(From meta-openembedded rev: c0945057ff7dd2562f07bb579032218139397729)

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---

diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
index 3bb92fa..6ee571e 100644
--- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_7.4.4.bb
+++ b/meta-openembedded/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))
 }