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

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-03 14:55:57 +0000 (Tue, 03 Jan 2006)
New Revision: 840

Modified:
   branches/samba4/changelog
   branches/samba4/samba.config
   branches/samba4/samba.templates
Log:
Add (untested) code and templates for Samba 3 upgrading in config.


Modified: branches/samba4/changelog
===================================================================
--- branches/samba4/changelog	2006-01-03 14:46:00 UTC (rev 839)
+++ branches/samba4/changelog	2006-01-03 14:55:57 UTC (rev 840)
@@ -11,12 +11,14 @@
     whenever upstream syncs with us.
   * Attempt to upgrade from Samba 3 if that's what the user tries to do.
     * Copy upgrade script into /usr/lib/samba/setup.
+    * Check for upgrade from << 3.9.0 in config, and ask the user for upgrade
+      if relevant.
     * Check for upgrade from << 3.9.0 in postinst, and upgrade if the user
       wished to.
   * Run "make quicktest" on build.
   * Only provision in samba.postinst if we're being called with "configure".
 
- -- Steinar H. Gunderson <sesse at debian.org>  Tue,  3 Jan 2006 15:19:55 +0100
+ -- Steinar H. Gunderson <sesse at debian.org>  Tue,  3 Jan 2006 15:55:14 +0100
 
 samba (3.9.0+SVN12395-1) unstable; urgency=low
 

Modified: branches/samba4/samba.config
===================================================================
--- branches/samba4/samba.config	2006-01-03 14:46:00 UTC (rev 839)
+++ branches/samba4/samba.config	2006-01-03 14:55:57 UTC (rev 840)
@@ -6,6 +6,19 @@
 
 db_title "Samba Server"
 
+# See if we're upgrading from Samba 3
+if [ "$1" == "configure" -a ! -z "$2" ]; then
+	if dpkg --compare-versions "$2" lt "3.9.0"; then
+		db_input samba/upgrade-from-v3 || true
+		db_go || true
+
+		db_get samba/upgrade-from-v3
+		if [ "$RET" = "true" ]; then
+			exit
+		fi
+	fi
+fi
+
 db_input medium samba4-server/setup-pdc || true
 db_go || true
 

Modified: branches/samba4/samba.templates
===================================================================
--- branches/samba4/samba.templates	2006-01-03 14:46:00 UTC (rev 839)
+++ branches/samba4/samba.templates	2006-01-03 14:55:57 UTC (rev 840)
@@ -1,3 +1,11 @@
+Template: samba/upgrade-from-v3
+Type: boolean
+Default: true
+_Description: Upgrade from Samba 3?
+ Do you want to migrate your existing configuration files from Samba 3 to
+ Samba 4? This is likely to fail for complex setups, but should provide a
+ good starting point for most existing installations.
+
 Template: samba/setup-pdc
 Type: boolean
 Default: false