[debian-edu-commits] r80372 - in branches/wheezy/debian-edu-config: bin debian

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-08 13:04:16 +0000 (Sat, 08 Jun 2013)
New Revision: 80372

Modified:
   branches/wheezy/debian-edu-config/bin/debconf-set-selections-edu
   branches/wheezy/debian-edu-config/debian/changelog
Log:
Try to fix #711251 by changing debconf-set-selections-edu to not
set the debconf template default value for passwords.

Modified: branches/wheezy/debian-edu-config/bin/debconf-set-selections-edu
===================================================================
--- branches/wheezy/debian-edu-config/bin/debconf-set-selections-edu	2013-06-08 11:52:36 UTC (rev 80371)
+++ branches/wheezy/debian-edu-config/bin/debconf-set-selections-edu	2013-06-08 13:04:16 UTC (rev 80372)
@@ -51,7 +51,11 @@
 		$template->extended_description("This is a fake template used to pre-seed the debconf database. If you are seeing this, something is probably wrong.");
 	}
 	else {
-		$template->default($content);
+		if ("password" ne $type) {
+			$template->default($content);
+		} else {
+			$template->default("");
+		}
 	}
 	$template->type($type);
 	

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-08 11:52:36 UTC (rev 80371)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-08 13:04:16 UTC (rev 80372)
@@ -3,6 +3,8 @@
   * Made sure subnet-change warn those trying to switch to one of the
     problematic subnets, while allowing them to continue by adding
     option -f.
+  * Try to fix #711251 by changing debconf-set-selections-edu to not
+    set the debconf template default value for passwords.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 08 Jun 2013 09:37:16 +0200