From patchwork Mon Jan 3 20:02:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [10/12] busybox: simplify update-rc.d OPT handling Date: Mon, 03 Jan 2011 20:02:04 -0000 From: Bernhard Reutner-Fischer X-Patchwork-Id: 156 Message-Id: <1294084926-3115-10-git-send-email-rep.dot.nop@gmail.com> To: openembedded-devel@lists.openembedded.org style-only change Signed-off-by: Bernhard Reutner-Fischer Acked-by: Otavio Salvador --- recipes/busybox/busybox.inc | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc index 59653e0..b105337 100644 --- a/recipes/busybox/busybox.inc +++ b/recipes/busybox/busybox.inc @@ -291,11 +291,7 @@ pkg_prerm_${PN}-shadow () { pkg_postinst_${PN}-syslog () { update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50 - if test "x$D" != "x"; then - OPT="-r $D" - else - OPT="-s" - fi + [ -n "$D" ] && OPT="-r $D" || OPT="-s" # remove all rc.d-links potentially created from alternative # syslog packages before creating new ones update-rc.d $OPT -f syslog remove @@ -313,13 +309,9 @@ pkg_prerm_${PN}-syslog () { } pkg_postrm_${PN}-syslog () { - if test "x$D" != "x"; then - OPT="-r $D" - else - OPT="" - fi if test "$1" = "remove" -o "$1" = "purge"; then if ! test -e "/etc/init.d/syslog"; then + [ -n "$D" ] && OPT="-r $D" || OPT="-s" update-rc.d $OPT syslog remove fi fi