[debian-edu-commits] debian-edu/ 01/02: Reorder and correct postinst code to clean up old pam-configs override to make sure it is removed before running pam-auth-update --package, to avoid failure during upgrades.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit 75684c4975d3fd40b5b558e5025a318d94098636
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Sep 11 20:28:59 2014 +0200

    Reorder and correct postinst code to clean up old pam-configs override to make sure it is removed before running pam-auth-update --package, to avoid failure during upgrades.
---
 debian/debian-edu-config.postinst | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index a553705..361ad4d 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -136,6 +136,15 @@ if [ "$RET" = "false" ] ; then
 	fi
 fi
 
+# Remove now obsolete diverted config file as bug #656309 is fixed
+if [ configure = "$1" ] && \
+    dpkg --compare-versions "$2" le "1.726" && \
+    [ -h /usr/share/pam-configs/edu-krb5 ]; then
+    dpkg-divert --package debian-edu-config --remove /usr/share/pam-configs/krb5
+    rm /usr/share/pam-configs/edu-krb5
+    pam-auth-update --package --remove edu-krb5
+fi
+
 pam-auth-update --package
 
 # Some init-scripts fail if to many fd is open ??
@@ -284,13 +293,6 @@ configure)
 	    chown nbd:nbd $swapfiles
 	fi
     fi
-    # Remove now obsolete diverted config file as bug #656309 is fixed
-    if dpkg --compare-versions "$2" le "1.726" && [ -e /usr/share/pam-configs/edu-krb5 ]; then
-            dpkg-divert --package debian-edu-config --remove /usr/share/pam-configs/krb5
-	    pam-auth-update --package --remove edu-krb5
-	    rm /usr/share/pam-configs/edu-krb5
-	fi
-    fi
 
     # sssd refuses to read the file if it has any other mode
     chmod 600 /etc/sssd/sssd-debian-edu.conf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git