[Pkg-samba-maint] r847 - branches/samba4

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-03 15:55:04 +0000 (Tue, 03 Jan 2006)
New Revision: 847

Modified:
   branches/samba4/samba.postinst
Log:
Move the sourcing of confmodule up before the if, so we're sure (?)
we'll get the debconf templates loaded correctly.


Modified: branches/samba4/samba.postinst
===================================================================
--- branches/samba4/samba.postinst	2006-01-03 15:49:25 UTC (rev 846)
+++ branches/samba4/samba.postinst	2006-01-03 15:55:04 UTC (rev 847)
@@ -2,9 +2,9 @@
 
 set -e
 
+. /usr/share/debconf/confmodule
+
 if [ "$1" = "configure" ]; then
-	. /usr/share/debconf/confmodule
-
 	# See if we're upgrading from Samba 3
 	UPGRADE_FROM_V3=
 	if [ ! -z "$2" ]; then
@@ -13,6 +13,7 @@
 			if [ "$RET" = "true" ]; then
 				UPGRADE_FROM_V3=yes
 				/usr/lib/samba/setup/upgrade	
+				db_stop
 			fi
 		fi
 	fi