[oe] [meta-networking][PATCH v2] postfix: fix pkg_postinst_${PN}

[Alexander Kanavin]

I might not be understanding this. Why is the original fragment
incorrect and the new one correct?

Original:

        # This can fail depending on host setup
        if ! newaliases -C $D/etc/postfix/main.cf -oA$D/etc/aliases; then
            $INTERCEPT_DIR/postinst_intercept delay_to_first_boot
${PKG} mlprefix=${MLPREFIX}
            exit 0
        fi
        touch $D/etc/postfix/virtual_alias
        postmap -c $D/etc/postfix $D/etc/postfix/virtual_alias

    fi
}


Patched:

         if ! newaliases -C $D/etc/postfix/main.cf -oA$D/etc/aliases; then
             $INTERCEPT_DIR/postinst_intercept delay_to_first_boot
${PKG} mlprefix=${MLPREFIX}
         else
            touch $D/etc/postfix/virtual_alias
            postmap -c $D/etc/postfix $D/etc/postfix/virtual_alias
         fi

    fi
}



What problem is being fixed here?

Alex

2018-09-13 11:34 GMT+02:00  <mingli.yu at windriver.com>:
> From: Mingli Yu <Mingli.Yu at windriver.com>
>
> "exit 0" will break the postinst logic
> below the line "exit 0" such as:
> ===
> update-alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.postfix 120
> update-alternatives --install /usr/bin/mailq mailq /usr/bin/mailq.postfix 120
> update-alternatives --install /usr/bin/newaliases newaliases /usr/bin/newaliases.postfix 120
> ===
>
> It's enough to call "$INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX}"
> , so remove it to guarantee the postinstall logic is correct
>
> Signed-off-by: Mingli Yu <Mingli.Yu at windriver.com>
> ---
>  meta-networking/recipes-daemons/postfix/postfix.inc | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc
> index 49f9f7b1f..882b27b6e 100644
> --- a/meta-networking/recipes-daemons/postfix/postfix.inc
> +++ b/meta-networking/recipes-daemons/postfix/postfix.inc
> @@ -246,10 +246,10 @@ pkg_postinst_${PN} () {
>          # This can fail depending on host setup
>          if ! newaliases -C $D/etc/postfix/main.cf -oA$D/etc/aliases; then
>              $INTERCEPT_DIR/postinst_intercept delay_to_first_boot ${PKG} mlprefix=${MLPREFIX}
> -            exit 0
> +        else
> +            touch $D/etc/postfix/virtual_alias
> +            postmap -c $D/etc/postfix $D/etc/postfix/virtual_alias
>          fi
> -        touch $D/etc/postfix/virtual_alias
> -        postmap -c $D/etc/postfix $D/etc/postfix/virtual_alias
>
>      fi
>  }
> --
> 2.13.3
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel