[Pkg-shadow-commits] r388 - trunk/debian

[Alexander Gattin]

Author: xrgtn-guest
Date: 2005-07-20 14:57:40 +0000 (Wed, 20 Jul 2005)
New Revision: 388

Modified:
   trunk/debian/changelog
   trunk/debian/passwd.postinst
   trunk/debian/passwd.preinst
Log:
moved `shadowconfig on` from .preinst to .postinst

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-07-20 06:49:28 UTC (rev 387)
+++ trunk/debian/changelog	2005-07-20 14:57:40 UTC (rev 388)
@@ -1,5 +1,8 @@
 shadow (1:4.0.3-39) UNRELEASED; urgency=low
 
+  * Debian packaging fixes:
+    - moved `shadowconfig on` from .preinst to .postinst
+    Closes: #319138
   * Programs translation updates:
     - French completed.
 

Modified: trunk/debian/passwd.postinst
===================================================================
--- trunk/debian/passwd.postinst	2005-07-20 06:49:28 UTC (rev 387)
+++ trunk/debian/passwd.postinst	2005-07-20 14:57:40 UTC (rev 388)
@@ -8,8 +8,8 @@
 	cp -p /usr/share/passwd/shells /etc/shells
 fi
 
-if test "$1" = configure
-then
+case "$1" in
+configure)
     rm -f /etc/pam.d/passwd.pre-upgrade 2>/dev/null
 	if ! getent group shadow | grep -q '^shadow:[^:]*:42'
 	then
@@ -26,7 +26,11 @@
     			exit 1
 		)
 	fi
-fi
+    ;;
+install)
+    [ "x$2" = "x" ] && shadowconfig on
+    ;;
+esac
 
 #DEBHELPER#
 

Modified: trunk/debian/passwd.preinst
===================================================================
--- trunk/debian/passwd.preinst	2005-07-20 06:49:28 UTC (rev 387)
+++ trunk/debian/passwd.preinst	2005-07-20 14:57:40 UTC (rev 388)
@@ -29,10 +29,7 @@
 	    if dpkg --compare-versions $2 lt 1:4.0.3 ; then
 		remove_md5 /etc/pam.d/passwd 23a5d1465bbc1e39ca6e0c32f22a75c9
 	    fi
-	else
-	    shadowconfig on
 	fi
-	    
     ;;
 
     abort-upgrade)