merge from master

data/custom-installation/patch/autopartition-loop

@@ -23,6 +23,17 @@ if [ -e /dev/loopdummy ]; then
 	rm /dev/loopdummy
 fi
 
+# disable db_set to use preseed file instead
+filename_partman_efi='/usr/lib/partman/check.d/08biosgrub'
+oldvalue_partman_efi='db_set '
+newvalue_partman_efi='#b_set '
+
+if [ -f $filename_partman_efi ]; then
+	if cat $filename_partman_efi | grep "$oldvalue_partman_efi" >/dev/null; then
+		sed -i "s%$oldvalue_partman_efi%$newvalue_partman_efi%g" $filename_partman_efi
+	fi
+fi
+
 # Set up working directory.
 
 if type mktemp >/dev/null 2>&1; then

data/preseed.lupin

@@ -35,9 +35,10 @@ d-i partman/choose_partition select finish
 d-i partman/confirm boolean true
 d-i partman/confirm_nooverwrite boolean true
 d-i partman/filter_mounted boolean false
+d-i partman-efi/no_efi boolean false
+d-i partman-partitioning/no_bootable_efi boolean false
 d-i ubiquity/partman-skip-unmount boolean true
 
-
 ## CLOCK AND TIME ZONE
 d-i clock-setup/utc boolean false
 d-i time/zone string $(timezone)

debian/changelog

@@ -1,8 +1,14 @@
-wubi (20.04.1r341) focal; urgency=low
+wubi (20.04.1r342) focal; urgency=low
 
   [Hakuna Matata]
 
-  * Update to 20.04.1 (#226)
+  * Merge from master
+
+wubi (20.04r342) focal; urgency=low
+
+  [Hakuna Matata]
+
+  * skip "no EFI partition" messages and errors (#163)(#209)
 
 wubi (20.04r341) focal; urgency=low