=== modified file 'debian/changelog'
--- debian/changelog	2010-04-15 00:11:47 +0000
+++ debian/changelog	2010-04-19 16:59:35 +0000
@@ -1,3 +1,9 @@
+user-setup (1.28ubuntu7) UNRELEASED; urgency=low
+
+  * Allow forcing the encrypted home option (LP: #566552).
+
+ -- Evan Dandrea <evand@ubuntu.com>  Mon, 19 Apr 2010 15:26:19 +0100
+
 user-setup (1.28ubuntu6) lucid; urgency=low
 
   * Update Ubuntu-specific translations from Launchpad.

=== modified file 'debian/user-setup-udeb.templates'
--- debian/user-setup-udeb.templates	2010-03-05 11:50:55 +0000
+++ debian/user-setup-udeb.templates	2010-04-19 16:59:35 +0000
@@ -208,3 +208,9 @@
 Template: user-setup/progress/wipe-swap
 Type: text
 _Description: Wiping swap space for security (this may take a while)...
+
+# Do not preseed this, it will be overwritten.
+Template: user-setup/force-encrypt-home
+Type: boolean
+Default: false
+Description: for internal use only

=== modified file 'user-setup-ask'
--- user-setup-ask	2009-08-18 10:23:10 +0000
+++ user-setup-ask	2010-04-19 16:59:35 +0000
@@ -238,7 +238,12 @@
 		USER="$RET"
 		db_get passwd/make-user
 		if [ "$RET" = true ] && [ ! -d "$ROOT/home/$USER" ]; then
-			db_input high user-setup/encrypt-home || true
+			db_get user-setup/force-encrypt-home
+			if [ "$RET" = true ]; then
+				db_set user-setup/encrypt-home true
+			else
+				db_input high user-setup/encrypt-home || true
+			fi
 		fi
 		;;
 	    9)