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

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-24 14:56:39 +0000 (Tue, 24 Jan 2006)
New Revision: 991

Modified:
   branches/samba4/changelog
   branches/samba4/samba.config
   branches/samba4/samba.postinst
Log:
Ask for the realm (and give it to the upgrade script) when upgrading from
Samba 3; it can't be easily autodetected. (Note that upgrade still seems
to be broken for now.)


Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-24 14:41:04 UTC (rev 990)
+++ branches/samba4/changelog	2006-01-24 14:56:39 UTC (rev 991)
@@ -10,6 +10,9 @@
   * Make the samba dependency on samba-common versioned.
   * Install /usr/bin/setntacl manually; the upstream install target doesn't
     seem to do it anymore.
+  * Ask for the realm (and give it to the upgrade script) when upgrading from
+    Samba 3; it can't be easily autodetected. (Note that upgrade still seems
+    to be broken for now.)
 
   [ Jelmer Vernooij ]
   * Remove gwsam utility.

Modified: branches/samba4/samba.config
===================================================================
--- branches/samba4/samba.config	2006-01-24 14:41:04 UTC (rev 990)
+++ branches/samba4/samba.config	2006-01-24 14:56:39 UTC (rev 991)
@@ -15,6 +15,11 @@
 		if [ -f /etc/samba/smb.conf ]; then
 			db_input medium samba/upgrade-from-v3 || true
 			db_go || true
+
+			# The realm can't be easily autodetected from the Samba 3
+			# settings.
+			db_input medium samba-common/realm || true
+			db_go || true
 		fi
 	fi
 

Modified: branches/samba4/samba.postinst
===================================================================
--- branches/samba4/samba.postinst	2006-01-24 14:41:04 UTC (rev 990)
+++ branches/samba4/samba.postinst	2006-01-24 14:56:39 UTC (rev 991)
@@ -10,8 +10,11 @@
 		if dpkg --compare-versions "$2" lt "3.9.0"; then
 			db_get samba/upgrade-from-v3 || true
 			if [ "$RET" = "true" ]; then
+				db_get samba-common/realm || true
+				REALM="$RET"
+
 				mv /etc/samba/smb.conf /etc/samba/smb.conf.samba3
-				/usr/lib/samba/setup/upgrade /var/lib/samba /etc/samba/smb.conf.samba3
+				/usr/lib/samba/setup/upgrade --realm="$REALM" /var/lib/samba /etc/samba/smb.conf.samba3
 			fi
 		fi
 	else