Merge lp:~cyphermox/ubiquity/crypto-not-preseed into lp:ubiquity

[Mathieu Trudel-Lapierre]

+ * ubiquity/plugins/ubi-partman.py: allow prompting for a missing passphrase
+ on preseeded installs, if they are requesting to setup crypto.
+ (LP: #1386131)

[Barry Warsaw (barry)]

LGTM, though I admit to not being totally familiar with the code. See my inline comments though.

review: Approve

[VEG (veg)]

Please remove me from subscribers list of this ticket. I don't know how I got here. I haven't used this account for years, and suddenly I've started to receive many notifications from this ticket.
I can't unsubscribe by myself because there is no edit button http://veg.by/z/2015-02-05-00-59-52.png
Thanks.

[VEG (veg)]

I've found how to remove myself from subscribers list.
It's strange that I've been subscribed. I've even don't know what is “ubiquity” :)
Sorry to bother you.

=== modified file 'd-i/manifest'
--- d-i/manifest	2015-01-28 19:33:47 +0000
+++ d-i/manifest	2015-02-04 18:50:56 +0000
@@ -6,12 +6,12 @@
 console-setup 1.70ubuntu11
 debian-installer-utils 1.109ubuntu1
 flash-kernel 3.0~rc.4ubuntu53
-grub-installer 1.78ubuntu23
+grub-installer 1.78ubuntu24
 hw-detect 1.95ubuntu4
 localechooser 2.49ubuntu5
 netcfg 1.119ubuntu2
 partconf 1.46
-partman-auto 118ubuntu3
+partman-auto 118ubuntu5
 partman-auto-crypto 22ubuntu1
 partman-auto-loop 0ubuntu21
 partman-auto-lvm 56ubuntu1
@@ -20,7 +20,7 @@
 partman-basicmethods 58
 partman-btrfs 14ubuntu2
 partman-crypto 78ubuntu1
-partman-efi 25ubuntu7
+partman-efi 62ubuntu1
 partman-ext3 84ubuntu1
 partman-jfs 45
 partman-lvm 105

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-02 23:50:45 +0000
+++ debian/changelog	2015-02-04 18:50:56 +0000
@@ -1,3 +1,13 @@
+ubiquity (2.21.8) UNRELEASED; urgency=medium
+
+  * Automatic update of included source packages: grub-installer
+    1.78ubuntu24, partman-auto 118ubuntu5, partman-efi 62ubuntu1.
+  * ubiquity/plugins/ubi-partman.py: allow prompting for a missing passphrase
+    on preseeded installs, if they are requesting to setup crypto.
+    (LP: #1386131)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 04 Feb 2015 10:45:32 -0500
+
 ubiquity (2.21.7) vivid; urgency=medium
 
   * bin/ubiquity-dm: update to use the proper gsettings keys for the MATE

=== modified file 'ubiquity/plugins/ubi-partman.py'
--- ubiquity/plugins/ubi-partman.py	2015-01-23 12:18:37 +0000
+++ ubiquity/plugins/ubi-partman.py	2015-02-04 18:50:56 +0000
@@ -65,6 +65,9 @@
     def __init__(self, *args, **kwargs):
         plugin.PluginUI.__init__(self)
 
+    def update_branded_strings(self):
+        pass
+
     def show_page_advanced(self):
         pass
 
@@ -100,6 +103,9 @@
     def get_grub_choice(self):
         return misc.grub_default()
 
+    def show_crypto_page(self):
+        pass
+
     def get_crypto_keys(self):
         pass
 
@@ -200,6 +206,21 @@
         # Define a list to save grub imformation
         self.grub_options = []
 
+    def update_branded_strings(self):
+        release = misc.get_release()
+
+        crypto_desc_obj = getattr(self, 'crypto_description_2')
+        text = self.controller.get_string(
+            'ubiquity/text/crypto_description_2')
+        text = text.replace('${RELEASE}', release.name)
+        crypto_desc_obj.set_label(text)
+
+        lvm_explanation_obj = getattr(self, 'partition_lvm_explanation')
+        text = self.controller.get_string(
+            'ubiquity/text/partition_lvm_explanation')
+        text = text.replace('${RELEASE}', release.name)
+        lvm_explanation_obj.set_label(text)
+
     def plugin_get_current_page(self):
         if self.current_page == self.page_ask:
             self.plugin_is_install = self.part_ask_option_is_install()
@@ -300,15 +321,8 @@
         # TODO dmitrij.ledkov 2012-07-25 no way to go back and return
         # to here? This needs to be addressed in the design document.
         if crypto and use_device and self.current_page == self.page_ask:
-            self.set_page_title(
-                self.controller.get_string('ubiquity/text/crypto_label'))
-            self.current_page = self.page_crypto
-            self.move_crypto_widgets()
-            self.show_encryption_passphrase(crypto)
-            self.controller.go_to_page(self.current_page)
-            self.controller.toggle_next_button('install_button')
+            self.show_crypto_page()
             self.plugin_is_install = one_disk
-            self.info_loop(None)
             return True
 
         if (self.current_page == self.page_crypto and
@@ -634,18 +648,6 @@
             desc = self.controller.get_string('ubiquity/text/use_lvm_desc')
             options['some_device_lvm'] = PartitioningOption(title, desc)
 
-        crypto_desc_obj = getattr(self, 'crypto_description_2')
-        text = self.controller.get_string(
-            'ubiquity/text/crypto_description_2')
-        text = text.replace('${RELEASE}', release.name)
-        crypto_desc_obj.set_label(text)
-
-        lvm_explanation_obj = getattr(self, 'partition_lvm_explanation')
-        text = self.controller.get_string(
-            'ubiquity/text/partition_lvm_explanation')
-        text = text.replace('${RELEASE}', release.name)
-        lvm_explanation_obj.set_label(text)
-
         ticked = False
         for option, name in option_to_widget:
             opt_widget = getattr(self, name)
@@ -1466,6 +1468,16 @@
         self.partition_dialog_okbutton.set_sensitive(complete)
         return complete
 
+    def show_crypto_page(self):
+        self.set_page_title(
+            self.controller.get_string('ubiquity/text/crypto_label'))
+        self.current_page = self.page_crypto
+        self.move_crypto_widgets()
+        self.show_encryption_passphrase(True)
+        self.controller.go_to_page(self.current_page)
+        self.controller.toggle_next_button('install_button')
+        self.info_loop(None)
+
     def get_crypto_keys(self):
         if self.info_loop(None):
             return self.password.get_text()
@@ -1621,6 +1633,8 @@
         self.local_progress = False
         self.swap_size = 0
 
+        self.ui.update_branded_strings()
+
         self.install_bootloader = False
         if (self.db.get('ubiquity/install_bootloader') == 'true' and
                 'UBIQUITY_NO_BOOTLOADER' not in os.environ):
@@ -3122,10 +3136,21 @@
             return True
 
         elif question.startswith('partman-crypto/passphrase'):
+            # Go forward rather than back in response to passphrase and
+            # passphrase-again questions if the UI is not available but they
+            # have been preseeded
+            if not hasattr(self.ui, 'get_crypto_keys'):
+                return self.db.fget(question, 'seen') == 'true'
+
+            do_preseed = True
             if not self.ui.get_crypto_keys():
-                return self.db.fget(question, 'seen') == 'true'
-            self.preseed(question, self.ui.get_crypto_keys())
-            return True
+                if hasattr(self.ui, 'show_crypto_page'):
+                    do_preseed = False
+                    self.ui.show_crypto_page()
+
+            if do_preseed:
+                self.preseed(question, self.ui.get_crypto_keys())
+                return True
 
         elif question == 'partman-crypto/mainmenu':
             if self.activating_crypto: