[oe] [PATCH 10/12] busybox: simplify update-rc.d OPT handling

[Otavio Salvador]

Acked-by: Otavio Salvador <otavio at ossystems.com.br>

On Mon, Jan 3, 2011 at 18:02, Bernhard Reutner-Fischer
<rep.dot.nop at gmail.com> wrote:
> style-only change
>
> Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
> ---
>  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
> --
> 1.7.2.3
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>



-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio at ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br