=== modified file 'd-i/manifest'
--- a/d-i/manifest 2015-04-15 17:49:05 +0000
+++ b/d-i/manifest 2015-04-16 19:26:38 +0000
@@ -20,7 +20,7 @@ partman-basicfilesystems 109ubuntu1
partman-basicmethods 58
partman-btrfs 14ubuntu2
partman-crypto 78ubuntu1
-partman-efi 62ubuntu1
+partman-efi 62ubuntu2
partman-ext3 84ubuntu1
partman-jfs 45
partman-lvm 105
@@ -31,5 +31,5 @@ partman-uboot 5
partman-xfs 55
preseed 1.64ubuntu2
tzsetup 1:0.26ubuntu12
-user-setup 1.48ubuntu3
+user-setup 1.48ubuntu5
yaboot-installer 1.1.33ubuntu1
=== modified file 'debian/changelog'
--- a/debian/changelog 2015-04-15 17:52:44 +0000
+++ b/debian/changelog 2015-04-16 19:27:10 +0000
@@ -1,3 +1,18 @@
+ubiquity (2.21.22) vivid; urgency=medium
+
+ * Automatic update of included source packages: partman-efi 62ubuntu2,
+ user-setup 1.48ubuntu5.
+ * debian/ubiquity.templates: add a string for "Continue in UEFI mode".
+ * ubiquity/plugins/ubi-partman.py: Fix up the buttons for the non_efi_system
+ question to use the new string for UEFI mode.
+ * ubiquity/plugins/ubi-partman.py: try to reverse the meaning of the debconf
+ partman-efi/non_efi_system question so that "Continue in UEFI mode" will
+ actually really mean continuing with setting up an EFI System Partition
+ and "Go Back" will properly return to the partitioning scheme selection
+ page and allow to try again without an ESP. (LP: #1444104)
+
+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Thu, 16 Apr 2015 14:27:08 -0500
+
ubiquity (2.21.21) vivid; urgency=medium
* KDE: ubiquity/plugins/ubi-console-setup.py workaround for LP: #1182784
=== modified file 'debian/ubiquity.templates'
--- a/debian/ubiquity.templates 2014-04-22 13:31:25 +0000
+++ b/debian/ubiquity.templates 2015-04-15 21:17:19 +0000
@@ -500,6 +500,11 @@ Type: text
# Translators, this text will appear on a button, so KEEP IT SHORT
_Description: Continue
+Template: ubiquity/text/in_uefi_mode
+Type: text
+# Translators, this text will appear on a button, so KEEP IT SHORT
+_Description: Continue in UEFI mode
+
Template: ubiquity/finished_restart_only
Type: text
_Description:
=== modified file 'ubiquity/plugins/ubi-partman.py'
--- a/ubiquity/plugins/ubi-partman.py 2015-02-04 18:43:17 +0000
+++ b/ubiquity/plugins/ubi-partman.py 2015-04-15 21:21:19 +0000
@@ -3211,6 +3211,9 @@ PARTITION_PLACE_END = 1
if question == 'partman/unmount_active':
yes = 'ubiquity/imported/yes'
no = 'ubiquity/imported/no'
+ elif question == 'partman-efi/non_efi_system':
+ yes = 'ubiquity/text/in_uefi_mode'
+ no = 'ubiquity/text/go_back'
else:
yes = 'ubiquity/text/continue'
no = 'ubiquity/text/go_back'
@@ -3219,7 +3222,9 @@ PARTITION_PLACE_END = 1
self.extended_description(question), (no, yes))
answer_reversed = False
- if question in ('partman-jfs/jfs_boot', 'partman-jfs/jfs_root',
+ if question in ('partman-jfs/jfs_boot',
+ 'partman-jfs/jfs_root',
+ 'partman-efi/non_efi_system',
'partman/unmount_active'):
answer_reversed = True
if response == yes: