Merge lp:~cyphermox/ubiquity/force_uefi into lp:ubiquity

Proposed by Mathieu Trudel-Lapierre on 2015-04-15
Status: Merged
Merged at revision: 6291
Proposed branch: lp:~cyphermox/ubiquity/force_uefi
Merge into: lp:ubiquity
Diff against target: 61 lines (+24/-1)
3 files modified
debian/changelog (+13/-0)
debian/ubiquity.templates (+5/-0)
ubiquity/plugins/ubi-partman.py (+6/-1)
To merge this branch: bzr merge lp:~cyphermox/ubiquity/force_uefi
Reviewer Review Type Date Requested Status
Ubuntu Installer Team 2015-04-15 Pending
Review via email: mp+256412@code.launchpad.net

Description of the change

Better handle the partman-efi/non_efi_system question and its meaning.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-04-15 17:52:44 +0000
3+++ debian/changelog 2015-04-15 22:50:32 +0000
4@@ -1,3 +1,16 @@
5+ubiquity (2.21.22) UNRELEASED; urgency=medium
6+
7+ * debian/ubiquity.templates: add a string for "Continue in UEFI mode".
8+ * ubiquity/plugins/ubi-partman.py: Fix up the buttons for the non_efi_system
9+ question to use the new string for UEFI mode.
10+ * ubiquity/plugins/ubi-partman.py: try to reverse the meaning of the debconf
11+ partman-efi/non_efi_system question so that "Continue in UEFI mode" will
12+ actually really mean continuing with setting up an EFI System Partition
13+ and "Go Back" will properly return to the partitioning scheme selection
14+ page and allow to try again without an ESP. (LP: #1444104)
15+
16+ -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com> Tue, 14 Apr 2015 14:31:03 -0500
17+
18 ubiquity (2.21.21) vivid; urgency=medium
19
20 * KDE: ubiquity/plugins/ubi-console-setup.py workaround for LP: #1182784
21
22=== modified file 'debian/ubiquity.templates'
23--- debian/ubiquity.templates 2014-04-22 13:31:25 +0000
24+++ debian/ubiquity.templates 2015-04-15 22:50:32 +0000
25@@ -500,6 +500,11 @@
26 # Translators, this text will appear on a button, so KEEP IT SHORT
27 _Description: Continue
28
29+Template: ubiquity/text/in_uefi_mode
30+Type: text
31+# Translators, this text will appear on a button, so KEEP IT SHORT
32+_Description: Continue in UEFI mode
33+
34 Template: ubiquity/finished_restart_only
35 Type: text
36 _Description:
37
38=== modified file 'ubiquity/plugins/ubi-partman.py'
39--- ubiquity/plugins/ubi-partman.py 2015-02-04 18:43:17 +0000
40+++ ubiquity/plugins/ubi-partman.py 2015-04-15 22:50:32 +0000
41@@ -3211,6 +3211,9 @@
42 if question == 'partman/unmount_active':
43 yes = 'ubiquity/imported/yes'
44 no = 'ubiquity/imported/no'
45+ elif question == 'partman-efi/non_efi_system':
46+ yes = 'ubiquity/text/in_uefi_mode'
47+ no = 'ubiquity/text/go_back'
48 else:
49 yes = 'ubiquity/text/continue'
50 no = 'ubiquity/text/go_back'
51@@ -3219,7 +3222,9 @@
52 self.extended_description(question), (no, yes))
53
54 answer_reversed = False
55- if question in ('partman-jfs/jfs_boot', 'partman-jfs/jfs_root',
56+ if question in ('partman-jfs/jfs_boot',
57+ 'partman-jfs/jfs_root',
58+ 'partman-efi/non_efi_system',
59 'partman/unmount_active'):
60 answer_reversed = True
61 if response == yes:

Subscribers

People subscribed via source and target branches

to status/vote changes: