diff -Nru partman-iscsi-16/choose_partition/iscsi/do_option partman-iscsi-17/choose_partition/iscsi/do_option
--- partman-iscsi-16/choose_partition/iscsi/do_option	2009-10-14 19:57:42.000000000 +0000
+++ partman-iscsi-17/choose_partition/iscsi/do_option	2011-07-20 16:01:51.000000000 +0000
@@ -8,7 +8,7 @@
 fi
 
 while :; do
-	db_input critical partman-iscsi/mainmenu
+	db_input critical partman-iscsi/mainmenu || true
 	db_go || exit 10
 	db_get partman-iscsi/mainmenu
 	case $RET in
diff -Nru partman-iscsi-16/debian/changelog partman-iscsi-17/debian/changelog
--- partman-iscsi-16/debian/changelog	2011-01-07 14:33:17.000000000 +0000
+++ partman-iscsi-17/debian/changelog	2011-07-20 16:04:27.000000000 +0000
@@ -1,3 +1,9 @@
+partman-iscsi (17) oneiric; urgency=low
+
+  * Don't fail if debconf questions are preseeded (LP: #810068).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 20 Jul 2011 17:04:26 +0100
+
 partman-iscsi (16) natty; urgency=low
 
   [ Jim Paris ]
diff -Nru partman-iscsi-16/lib/iscsi-base.sh partman-iscsi-17/lib/iscsi-base.sh
--- partman-iscsi-16/lib/iscsi-base.sh	2010-04-23 20:02:59.000000000 +0000
+++ partman-iscsi-17/lib/iscsi-base.sh	2011-07-20 16:01:38.000000000 +0000
@@ -7,7 +7,7 @@
 		case $state in
 		    0)
 			# Ask for target address.
-			db_input critical partman-iscsi/login/address
+			db_input critical partman-iscsi/login/address || true
 			;;
 
 		    1)
@@ -25,7 +25,7 @@
 
 			# Ask for initiator username.
 			db_subst partman-iscsi/login/username PORTAL "$portal"
-			db_input critical partman-iscsi/login/username
+			db_input critical partman-iscsi/login/username || true
 			;;
 
 		    2)
@@ -33,7 +33,7 @@
 			if [ "$RET" ]; then
 				# Ask for initiator password.
 				db_subst partman-iscsi/login/password PORTAL "$portal"
-				db_input critical partman-iscsi/login/password
+				db_input critical partman-iscsi/login/password || true
 			fi
 			;;
 
@@ -44,7 +44,7 @@
 				db_get partman-iscsi/login/password
 				if [ -z "$RET" ]; then
 					db_capb align
-					db_input critical partman-iscsi/login/empty_password
+					db_input critical partman-iscsi/login/empty_password || true
 					db_go || true
 					db_capb backup align
 					state=2
@@ -53,7 +53,7 @@
 
 				# Ask for target username.
 				db_subst partman-iscsi/login/incoming_username PORTAL "$portal"
-				db_input critical partman-iscsi/login/incoming_username
+				db_input critical partman-iscsi/login/incoming_username || true
 			fi
 			;;
 
@@ -64,7 +64,7 @@
 				if [ "$RET" ]; then
 					# Ask for target password.
 					db_subst partman-iscsi/login/incoming_password PORTAL "$portal"
-					db_input critical partman-iscsi/login/incoming_password
+					db_input critical partman-iscsi/login/incoming_password || true
 				fi
 			fi
 			;;
@@ -78,7 +78,7 @@
 					db_get partman-iscsi/login/incoming_password
 					if [ -z "$RET" ]; then
 						db_capb align
-						db_input critical partman-iscsi/login/empty_password
+						db_input critical partman-iscsi/login/empty_password || true
 						db_go || true
 						db_capb backup align
 						state=4
@@ -117,7 +117,7 @@
 				db_capb align
 				db_subst partman-iscsi/login/no_targets \
 					PORTAL "$portal"
-				db_input critical partman-iscsi/login/no_targets
+				db_input critical partman-iscsi/login/no_targets || true
 				db_go || true
 				db_capb backup align
 				state=0
@@ -135,7 +135,7 @@
 			   [ "$RET" = true ]; then
 				db_set partman-iscsi/login/targets "$targets"
 			else
-				db_input critical partman-iscsi/login/targets
+				db_input critical partman-iscsi/login/targets || true
 			fi
 			;;
 
@@ -171,7 +171,7 @@
 						PORTAL "$portal"
 					db_subst partman-iscsi/login/failed \
 						TARGET "$target"
-					db_input critical partman-iscsi/login/failed
+					db_input critical partman-iscsi/login/failed || true
 					db_go || true
 					db_capb backup align
 				fi