aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <Mingli.Yu@windriver.com>2018-09-13 17:34:52 +0800
committerKhem Raj <raj.khem@gmail.com>2018-09-14 19:01:41 -0700
commite6d2fc45e500b18851562a1f31c0cfc41f42cad6 (patch)
tree2725e6940bbe54971accc99873444426adf6ef6a
parente04a0b57f3cbcedd2765ce6c7b2e9d5737827a51 (diff)
downloadmeta-openembedded-e6d2fc45e500b18851562a1f31c0cfc41f42cad6.tar.gz
postfix: fix pkg_postinst_${PN}
"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@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-networking/recipes-daemons/postfix/postfix.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc
index 49f9f7b1fa..882b27b6ee 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
}