[oe-commits] org.oe.dev postfix: Fix the update-alternatives call for sendmail (both the syntax and the ordering were wrong - it was ending up in the root directory and newaliases was being called before it was set up.

[rwhitby commit]

postfix: Fix the update-alternatives call for sendmail (both the syntax and the ordering were wrong - it was ending up in the root directory and newaliases was being called before it was set up.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: bae0a94358106f7091683a440bcdf350ec3e9581
ViewMTN: http://monotone.openembedded.org/revision/info/bae0a94358106f7091683a440bcdf350ec3e9581
Files:
1
packages/postfix/postfix_2.0.20.bb
Diffs:

#
# mt diff -r45c8b5c656b902c4b4d8a4d012c672163c6d7bdf -rbae0a94358106f7091683a440bcdf350ec3e9581
#
#
#
# patch "packages/postfix/postfix_2.0.20.bb"
#  from [28a80079bbf7d94882e25cdb1989063b4d77190f]
#    to [16b089d53753270b87d594d1f1c392aeae965d6f]
#
============================================================
--- packages/postfix/postfix_2.0.20.bb	28a80079bbf7d94882e25cdb1989063b4d77190f
+++ packages/postfix/postfix_2.0.20.bb	16b089d53753270b87d594d1f1c392aeae965d6f
@@ -1,7 +1,7 @@ LICENSE = "IPL"
 SECTION = "console/network"
 DEPENDS = "virtual/db libpcre postfix-native"
 LICENSE = "IPL"
-PR = "r11"
+PR = "r12"
 
 SRC_URI = "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-${PV}.tar.gz \
 	   file://${FILESDIR}/makedefs.patch;patch=1 \
@@ -53,6 +53,7 @@ pkg_postinst () {
 }
 
 pkg_postinst () {
+	update-alternatives --install ${sbindir}/sendmail sendmail sendmail.${PN} 40
         grep postfix /etc/group || addgroup postfix
         grep postdrop /etc/group || addgroup postdrop
         grep vmail /etc/group || addgroup vmail
@@ -69,11 +70,10 @@ pkg_postinst () {
 	/etc/init.d/populate-volatile.sh update
 	touch /etc/aliases
 	newaliases
-	update-alternatives --install sendmail sendmail ${sbindir}/sendmail.${PN} 40
 }
 
 pkg_postrm () {
-	update-alternatives --remove sendmail ${sbindir}/sendmail
+	update-alternatives --remove sendmail sendmail.${PN}
 }
 
 # Exclude .debug directories from the main package