Merge lp:~xnox/ubiquity/crypto-done into lp:ubiquity

[Dimitri John Ledkov]

This branch adds support for automatic crypt recipe.

[Dimitri John Ledkov (xnox)]

This merge proposal depends on:
https://code.launchpad.net/~dmitrij.ledkov/partman-crypto/finish.d/+merge/117657

The resulting installation:
- boots in KVM using the recovery option
- fails to boot 'normally' in KVM
- untested on bare metal

[Colin Watson (cjwatson)]

This basically looks good, thanks! I confess I haven't gone through all
the state machines in fine detail or anything, but just a few nits and
then I think you should go ahead and merge this so that we can iterate
quickly.

> +Type: Text

Lower-case "text" in all these "Type:" lines.

> + <span foreground="darkred">Warning:</span> If you lose this security key, all data will be lost. if you need to, write down your key and keep it in a safe place elsewhere.

Capital letter at the start of sentences ("If you need to, ..."). Same
in the .ui file.

> - self.assertLessEqual(alloc.width, 640)
> - self.assertLessEqual(alloc.height, 500)
> + self.assertLessEqual(alloc.width, 640, page.module.NAME)
> + self.assertLessEqual(alloc.height, 500, page.module.NAME)

page.module.NAME doesn't seem like a helpful message on test failure.
At least include the expected and observed values.

> + if self.current_page == self.page_crypto and \
> + not self.get_crypto_keys():

Use grouping with parentheses in preference to backslash-continuation
(similarly elsewhere). So:

  if (self.current_page == self.page_crypto and
      not self.get_crypto_keys()):

No doubt we're not entirely consistent about this in existing code, but
let's do this in new code.

> + '^partman-crypto/.*passphrase.*',

> + elif question == 'partman-crypto/weak_passphrase':
> + self.preseed_bool(question, True, seen=False)
> + return True
> +
> + elif question.startswith('partman-crypto/passphrase'):
> + if not self.ui.get_crypto_keys():
> + return False
> + self.preseed(question, self.ui.get_crypto_keys())
> + return True
> +

I'd like to see these two sections match to avoid later problems if the
set of questions asked changes, so I think your entries in the question
list should preferably be:

  '^partman-crypto/weak_passphrase$',
  '^partman-crypto/passphrase.*',

[Dimitri John Ledkov (xnox)]

On 01/08/12 15:46, Colin Watson wrote:
> This basically looks good, thanks! I confess I haven't gone through all
> the state machines in fine detail or anything, but just a few nits and
> then I think you should go ahead and merge this so that we can iterate
> quickly.
>
>> +Type: Text
>
> Lower-case "text" in all these "Type:" lines.
>

ok.

>> + <span foreground="darkred">Warning:</span> If you lose this security key, all data will be lost. if you need to, write down your key and keep it in a safe place elsewhere.
>
> Capital letter at the start of sentences ("If you need to, ..."). Same
> in the .ui file.
>

ok.

>> - self.assertLessEqual(alloc.width, 640)
>> - self.assertLessEqual(alloc.height, 500)
>> + self.assertLessEqual(alloc.width, 640, page.module.NAME)
>> + self.assertLessEqual(alloc.height, 500, page.module.NAME)
>
> page.module.NAME doesn't seem like a helpful message on test failure.
> At least include the expected and observed values.
>

It already does, by default. So it now looks like this:

======================================================================
FAIL: test_pages_fit_on_a_netbook (test_gtkui.TestFrontend)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/tdlk/canonical/installer/crypto/tests/test_gtkui.py", line
79, in test_pages_fit_on_a_netbook
    self.assertLessEqual(alloc.height, 500, page.module.NAME)
AssertionError: 593 not less than or equal to 500 : language

----------------------------------------------------------------------

Which appears to be a peculiar fill packing bug which is visible when
manually starting ubiquity with a custom build, but not visible in
during the welcome screen. Will look into this more later.

>> + if self.current_page == self.page_crypto and \
>> + not self.get_crypto_keys():
>
> Use grouping with parentheses in preference to backslash-continuation
> (similarly elsewhere). So:
>
> if (self.current_page == self.page_crypto and
> not self.get_crypto_keys()):
>
> No doubt we're not entirely consistent about this in existing code, but
> let's do this in new code.
>

ok.

>> + '^partman-crypto/.*passphrase.*',
>
>> + elif question == 'partman-crypto/weak_passphrase':
>> + self.preseed_bool(question, True, seen=False)
>> + return True
>> +
>> + elif question.startswith('partman-crypto/passphrase'):
>> + if not self.ui.get_crypto_keys():
>> + return False
>> + self.preseed(question, self.ui.get_crypto_keys())
>> + return True
>> +
>
> I'd like to see these two sections match to avoid later problems if the
> set of questions asked changes, so I think your entries in the question
> list should preferably be:
>
> '^partman-crypto/weak_passphrase$',
> '^partman-crypto/passphrase.*',
>

ok.

--
Regards,
Dmitrijs.

[lp:~xnox/ubiquity/crypto-done]

5588. By Dimitri John Ledkov on 2012-08-01

Review comments

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'bin/ubiquity'
--- bin/ubiquity	2012-07-16 14:29:13 +0000
+++ bin/ubiquity	2012-08-01 15:23:23 +0000
@@ -495,6 +495,10 @@
     parser.add_option('--enable-partauto-lvm', dest='partauto_lvm',
                       action='store_true',
                       help='Enable LVM in the automatic partitioner.')
+    parser.add_option('--enable-partauto-crypto', dest='partauto_crypto',
+                      action='store_true',
+                      help='Enable Full Disk encryption in the automatic'
+                      'partitioner.')
     parser.add_option('--no-webcam', dest='webcam',
                       default=True, action='store_false',
                       help='Disable the webcam page.')
@@ -537,6 +541,9 @@
     if options.partauto_lvm:
         os.environ['UBIQUITY_PARTAUTO_LVM'] = '1'
 
+    if options.partauto_crypto:
+        os.environ['UBIQUITY_PARTAUTO_CRYPTO'] = '1'
+
     if not options.webcam:
         os.environ['UBIQUITY_NO_WEBCAM'] = '1'
 
 
=== modified file 'd-i/lists/any'
--- d-i/lists/any	2012-07-10 00:16:28 +0000
+++ d-i/lists/any	2012-08-01 15:23:23 +0000
@@ -10,12 +10,14 @@
 netcfg
 partconf
 partman-auto
+partman-auto-crypto
 partman-auto-loop
 partman-auto-lvm
 partman-base
 partman-basicfilesystems
 partman-basicmethods
 partman-btrfs
+partman-crypto
 partman-ext3
 partman-jfs
 partman-lvm
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-07-31 12:29:30 +0000
+++ debian/changelog	2012-08-01 15:23:23 +0000
@@ -1,9 +1,23 @@
 ubiquity (2.11.19) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * Simplify DebconfFilter.process_line slightly.
   * Simplify KeyboardNames._load_file using collections.defaultdict.
 
- -- Colin Watson <[e-mail]>  Tue, 31 Jul 2012 13:26:31 +0100
+  [ Dmitrijs Ledkovs ]
+  * Make the UI layout test print the failed page/step name.
+  * Add crypt security key setup page and move crypt/lvm checkboxes to the
+    ask page.
+  * Refactor password validation from ubi-usersetup into a reusable
+    component (for ubi-partman).
+  * Refactor set_autopartition_options method in ubi-partman.py.
+  * Add crypto option to ubi-partman.
+  * Add command line flag to enable crypt checkbox on the ask page.
+  * Add partman-crypto to the dependencies.
+  * Add translation strings for crypto.
+  * Add graphviz diagram of available ask page options.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Wed, 01 Aug 2012 15:02:14 +0100
 
 ubiquity (2.11.18) quantal; urgency=low
 
 
=== modified file 'debian/ubiquity.templates'
--- debian/ubiquity.templates	2012-07-16 10:10:04 +0000
+++ debian/ubiquity.templates	2012-08-01 15:23:23 +0000
@@ -1368,6 +1368,64 @@
  This computer currently has no detected operating systems. What would you
  like to do?
 
-Template: ubiquity/text/part_auto_use_lvm_checkbox
-Type: text
-_Description: Set up LVM
+Template: ubiquity/text/use_crypto_title
+Type: text
+_Description:
+ Encrypt the new Ubuntu installation for security
+
+Template: ubiquity/text/use_crypto_desc
+Type: text
+_Description:
+ You will choose a security key in the next step.
+
+Template: ubiquity/text/use_lvm_title
+Type: text
+_Description:
+ Use LVM with the new Ubuntu installation
+
+Template: ubiquity/text/use_lvm_desc
+Type: text
+_Description:
+ This will set up Logical Volume Management. It allows taking snapshots and easier partition resizing.
+
+Template: ubiquity/text/verified_crypto_label
+Type: text
+_Description:
+ Confirm the security key:
+
+Template:ubiquity/text/crypto_label
+Type: text
+_Description:
+ Choose a security key:
+
+Template:ubiquity/text/crypto_description
+Type: text
+_Description:
+ Disk encryption protects your files in case you lose your computer. It requires you to enter a security key each time the computer starts up. 
+
+Template:ubiquity/text/crypto_description_2
+Type: text
+_Description:
+ Any files outside of Ubuntu will not be encrypted.
+
+Template:ubiquity/text/crypto_warning
+Type: text
+_Description:
+ <span foreground="darkred">Warning:</span> If you lose this security key, all data will be lost. If you need to, write down your key and keep it in a safe place elsewhere. 
+
+Template:ubiquity/text/crypto_exta_label
+Type: text
+_Description:
+ For more security:
+
+Template:ubiquity/text/fill_with_random_data
+Type: text
+_Description:
+ Overwrite empty disk space
+
+Template:ubiquity/text/crypto_extra_time
+Type: text
+_Description:
+ The installation may take much longer.
+ 
+
 
=== added file 'doc/ubi-partman-page-ask-statemachine.dot'
--- doc/ubi-partman-page-ask-statemachine.dot	1970-01-01 00:00:00 +0000
+++ doc/ubi-partman-page-ask-statemachine.dot	2012-08-01 15:23:23 +0000
@@ -0,0 +1,36 @@
+digraph {
+	{ rank = same;
+		use_device;
+		resize;
+		custom;
+		wubi;
+		reuse;
+		replace;
+	};
+	{ rank = same;
+		switch_to_install;
+		go_to_manual;
+		go_to_wubi;
+	};
+	{ node [shape = diamond];
+		biggest_free;
+		one_disk;
+		have_crypto;
+	};
+	use_device -> one_disk;
+	one_disk -> go_to_auto [label="no"];
+	one_disk -> have_crypto [label="yes"];
+	go_to_auto -> have_crypto [label="if use_device"];
+	have_crypto -> switch_to_install [label="no"];
+	have_crypto -> go_to_crypto [label="yes"];
+	go_to_crypto -> switch_to_install;
+	resize -> biggest_free;
+	biggest_free -> switch_to_install [label="yes"];
+	biggest_free -> go_to_auto [label="no"];
+	go_to_auto -> switch_to_install;
+	custom -> go_to_manual;
+	reuse -> switch_to_install;
+	replace -> switch_to_install;
+	wubi -> go_to_wubi;
+	go_to_crypto;
+};
 
=== modified file 'gui/gtk/stepPartAsk.ui'
--- gui/gtk/stepPartAsk.ui	2012-06-07 19:38:33 +0000
+++ gui/gtk/stepPartAsk.ui	2012-08-01 15:23:23 +0000
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
+  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-local-resource-path /home/evan/bzr/ubiquity.partitioner-redesign/pixmaps/partitioner -->
   <object class="GtkAlignment" id="stepPartAsk">
     <property name="visible">True</property>
@@ -39,6 +38,7 @@
             <property name="spacing">12</property>
             <child>
               <object class="GtkRadioButton" id="resize_use_free">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -46,10 +46,10 @@
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
-                <signal name="clicked" handler="part_ask_option_changed" swapped="no"/>
                 <accessibility>
                   <relation type="labelled-by" target="resize_use_free_title"/>
                 </accessibility>
+                <signal name="clicked" handler="part_ask_option_changed" swapped="no"/>
                 <child>
                   <object class="GtkBox" id="hbox1">
                     <property name="visible">True</property>
@@ -122,6 +122,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="replace_partition">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -129,10 +130,10 @@
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">resize_use_free</property>
-                <signal name="clicked" handler="part_ask_option_changed" swapped="no"/>
                 <accessibility>
                   <relation type="labelled-by" target="replace_partition_title"/>
                 </accessibility>
+                <signal name="clicked" handler="part_ask_option_changed" swapped="no"/>
                 <child>
                   <object class="GtkBox" id="hbox5">
                     <property name="visible">True</property>
@@ -205,16 +206,18 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="reuse_partition">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
+                <property name="xalign">0.5</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">resize_use_free</property>
-                <signal name="clicked" handler="part_ask_option_changed" swapped="no"/>
                 <accessibility>
                   <relation type="labelled-by" target="reuse_partition_title"/>
                 </accessibility>
+                <signal name="clicked" handler="part_ask_option_changed" swapped="no"/>
                 <child>
                   <object class="GtkBox" id="hbox2">
                     <property name="visible">True</property>
@@ -287,6 +290,7 @@
             </child>
             <child>
               <object class="GtkRadioButton" id="use_device">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -294,10 +298,10 @@
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">resize_use_free</property>
-                <signal name="clicked" handler="part_ask_option_changed" swapped="no"/>
                 <accessibility>
                   <relation type="labelled-by" target="use_device_title"/>
                 </accessibility>
+                <signal name="clicked" handler="part_ask_option_changed" swapped="no"/>
                 <child>
                   <object class="GtkBox" id="hbox3">
                     <property name="visible">True</property>
@@ -369,6 +373,116 @@
               </packing>
             </child>
             <child>
+              <object class="GtkCheckButton" id="use_crypto">
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+                <child>
+                  <object class="GtkBox" id="vbox7">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">3</property>
+                    <child>
+                      <object class="GtkLabel" id="use_crypto_title">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="label" translatable="yes">Encrypt the new Ubuntu installation for security</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="use_crypto_desc">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="label" translatable="yes">&lt;span weight="light" size="small"&gt;You’ll choose a security key in the next step.&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="use_lvm">
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+                <child>
+                  <object class="GtkBox" id="vbox8">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">3</property>
+                    <child>
+                      <object class="GtkLabel" id="use_lvm_title">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="label" translatable="yes">Use LVM with the new Ubuntu installation</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="use_lvm_desc">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="xalign">0</property>
+                        <property name="yalign">0</property>
+                        <property name="label" translatable="yes">&lt;span weight="light" size="small"&gt;This will set up Logical Volume Management. It allows taking snapshots and easier partition resizing.&lt;/span&gt;</property>
+                        <property name="use_markup">True</property>
+                        <property name="wrap">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -384,11 +498,12 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">4</property>
+                <property name="position">6</property>
               </packing>
             </child>
             <child>
               <object class="GtkRadioButton" id="custom_partitioning">
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
@@ -396,10 +511,10 @@
                 <property name="xalign">0</property>
                 <property name="draw_indicator">True</property>
                 <property name="group">resize_use_free</property>
-                <signal name="clicked" handler="part_ask_option_changed" swapped="no"/>
                 <accessibility>
                   <relation type="labelled-by" target="custom_partitioning_title"/>
                 </accessibility>
+                <signal name="clicked" handler="part_ask_option_changed" swapped="no"/>
                 <child>
                   <object class="GtkBox" id="hbox4">
                     <property name="visible">True</property>
@@ -467,7 +582,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">5</property>
+                <property name="position">7</property>
               </packing>
             </child>
           </object>
 
=== modified file 'gui/gtk/stepPartAuto.ui'
--- gui/gtk/stepPartAuto.ui	2012-07-16 10:10:04 +0000
+++ gui/gtk/stepPartAuto.ui	2012-08-01 15:23:23 +0000
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-requires gtkwidgets 0.0 -->
-  <!-- interface-naming-policy toplevel-contextual -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="liststore1">
     <columns>
       <!-- column-name gchararray1 -->
@@ -156,43 +154,6 @@
                 <property name="position">2</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkAlignment" id="alignment1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="top_padding">16</property>
-                <child>
-                  <object class="GtkBox" id="vbox_part_auto_recipes">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkCheckButton" id="part_auto_use_lvm_checkbox">
-                        <property name="label" translatable="yes">Set up LVM</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="xalign">0</property>
-                        <property name="image_position">top</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
 
=== added file 'gui/gtk/stepPartCrypto.ui'
--- gui/gtk/stepPartCrypto.ui	1970-01-01 00:00:00 +0000
+++ gui/gtk/stepPartCrypto.ui	2012-08-01 15:23:23 +0000
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkEventBox" id="stepPartCrypto">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkGrid" id="userinfo_table">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">20</property>
+        <property name="row_spacing">6</property>
+        <property name="column_spacing">6</property>
+        <child>
+          <object class="GtkLabel" id="verified_crypto_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Confirm the security key:</property>
+            <property name="justify">right</property>
+            <property name="single_line_mode">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">3</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="crypto_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Choose a security key:</property>
+            <property name="justify">right</property>
+            <property name="single_line_mode">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="crypto_description">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Disk encryption protects your files in case you lose your computer. It requires you to enter a security key each time the computer starts up.</property>
+            <property name="wrap">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+            <property name="width">4</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="crypto_warning">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">&lt;span foreground="darkred"&gt;Warning:&lt;/span&gt; If you lose this security key, all data will be lost. If you need to, write down your key and keep it in a safe place elsewhere.</property>
+            <property name="use_markup">True</property>
+            <property name="wrap">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">4</property>
+            <property name="width">4</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="crypto_exta_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">end</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">For more security:</property>
+            <property name="justify">right</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">5</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="fill_with_random_data">
+            <property name="label" translatable="yes">Overwrite empty disk space</property>
+            <property name="use_action_appearance">False</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="halign">start</property>
+            <property name="use_action_appearance">False</property>
+            <property name="xalign">0</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">5</property>
+            <property name="width">3</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="password_strength">
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">&lt;small&gt;&lt;span color="darkgreen"&gt;Strong password&lt;/span&gt;&lt;/small&gt;</property>
+            <property name="use_markup">True</property>
+            <property name="single_line_mode">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">2</property>
+            <property name="width">2</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="auto_password">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="has_focus">True</property>
+            <property name="visibility">False</property>
+            <property name="invisible_char">●</property>
+            <property name="activates_default">True</property>
+            <property name="width_chars">20</property>
+            <property name="invisible_char_set">True</property>
+            <accessibility>
+              <relation type="labelled-by" target="crypto_label"/>
+            </accessibility>
+            <signal name="changed" handler="info_loop" swapped="no"/>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="auto_verified_password">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="visibility">False</property>
+            <property name="invisible_char">●</property>
+            <property name="activates_default">True</property>
+            <property name="width_chars">20</property>
+            <property name="invisible_char_set">True</property>
+            <accessibility>
+              <relation type="labelled-by" target="verified_crypto_label"/>
+            </accessibility>
+            <signal name="changed" handler="info_loop" swapped="no"/>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="crypto_extra_time">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin_left">24</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">&lt;span weight="light" size="small"&gt;The installation may take much longer.&lt;/span&gt;</property>
+            <property name="use_markup">True</property>
+            <property name="single_line_mode">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">6</property>
+            <property name="width">3</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="crypto_description_2">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Any files outside of Ubuntu will not be encrypted.</property>
+            <property name="wrap">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+            <property name="width">4</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkImage" id="password_ok">
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="xalign">0</property>
+            <property name="stock">gtk-yes</property>
+          </object>
+          <packing>
+            <property name="left_attach">2</property>
+            <property name="top_attach">3</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="password_error_label">
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">&lt;small&gt;&lt;span color="darkred"&gt;Passwords do not match&lt;/span&gt;&lt;/small&gt;</property>
+            <property name="use_markup">True</property>
+            <property name="single_line_mode">True</property>
+          </object>
+          <packing>
+            <property name="left_attach">3</property>
+            <property name="top_attach">3</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>
 
=== modified file 'tests/test_gtkui.py'
--- tests/test_gtkui.py	2012-07-16 14:29:13 +0000
+++ tests/test_gtkui.py	2012-08-01 15:23:23 +0000
@@ -75,8 +75,8 @@
                     import time
                     time.sleep(3)
                 alloc = ui.live_installer.get_allocation()
-                self.assertLessEqual(alloc.width, 640)
-                self.assertLessEqual(alloc.height, 500)
+                self.assertLessEqual(alloc.width, 640, page.module.NAME)
+                self.assertLessEqual(alloc.height, 500, page.module.NAME)
                 if page.module.NAME == 'partman':
                     ui.allow_change_step(False)
 
 
=== modified file 'ubiquity/plugins/ubi-partman.py'
--- ubiquity/plugins/ubi-partman.py	2012-07-19 09:49:20 +0000
+++ ubiquity/plugins/ubi-partman.py	2012-08-01 15:23:23 +0000
@@ -29,6 +29,7 @@
 from ubiquity import parted_server
 from ubiquity import misc
 from ubiquity import osextras
+from ubiquity import validation
 from ubiquity.install_misc import archdetect
 
 NAME = 'partman'
@@ -98,6 +99,9 @@
     def get_grub_choice(self):
         return misc.grub_default()
 
+    def get_crypto_keys(self):
+        pass
+
 
 class PageGtk(PageBase):
     plugin_title = 'ubiquity/text/part_auto_heading_label'
@@ -114,11 +118,14 @@
             os.environ['UBIQUITY_GLADE'], 'stepPartAuto.ui'))
         builder.add_from_file(os.path.join(
             os.environ['UBIQUITY_GLADE'], 'stepPartAdvanced.ui'))
+        builder.add_from_file(os.path.join(
+            os.environ['UBIQUITY_GLADE'], 'stepPartCrypto.ui'))
         builder.connect_signals(self)
 
         self.page_ask = builder.get_object('stepPartAsk')
         self.page_auto = builder.get_object('stepPartAuto')
         self.page_advanced = builder.get_object('stepPartAdvanced')
+        self.page_crypto = builder.get_object('stepPartCrypto')
 
         # Grub options
         self.bootloader_vbox = builder.get_object('bootloader_vbox')
@@ -139,10 +146,8 @@
         self.part_auto_hidden_label = builder.get_object(
             'part_auto_hidden_label')
         self.part_advanced_vbox = builder.get_object('part_advanced_vbox')
-        self.vbox_part_auto_recipes = builder.get_object(
-            'vbox_part_auto_recipes')
-        self.part_auto_use_lvm_checkbox = builder.get_object(
-            'part_auto_use_lvm_checkbox')
+        self.use_lvm = builder.get_object('use_lvm')
+        self.use_crypto = builder.get_object('use_crypto')
 
         # Ask page
         self.part_ask_heading = builder.get_object('part_ask_heading')
@@ -163,6 +168,10 @@
             'custom_partitioning_title')
         self.custom_partitioning_desc = builder.get_object(
             'custom_partitioning_desc')
+        self.use_lvm_title = builder.get_object('use_lvm_title')
+        self.use_lvm_desc = builder.get_object('use_lvm_desc')
+        self.use_crypto_title = builder.get_object('use_crypto_title')
+        self.use_crypto_desc = builder.get_object('use_crypto_desc')
 
         # Advanced page
         self.partition_create_mount_combo = builder.get_object(
@@ -219,6 +228,19 @@
         self.part_advanced_recalculating_label = builder.get_object(
             'part_advanced_recalculating_label')
 
+        # Crypto page
+
+        self.auto_password = builder.get_object(
+            'auto_password')
+        self.password_error_label = builder.get_object(
+            'password_error_label')
+        self.auto_verified_password = builder.get_object(
+            'auto_verified_password')
+        self.password_strength = builder.get_object(
+            'password_strength')
+        self.password_ok = builder.get_object(
+            'password_ok')
+
         self.partition_bars = {}
         self.segmented_bar_vbox = None
         self.resize_min_size = None
@@ -232,7 +254,8 @@
             True)
         self.partition_edit_mount_combo.get_child().set_activates_default(True)
 
-        self.plugin_optional_widgets = [self.page_auto, self.page_advanced]
+        self.plugin_optional_widgets = [self.page_auto, self.page_advanced,
+                                        self.page_crypto]
         self.current_page = self.page_ask
 
         # Set some parameters that do not change between runs of the plugin
@@ -284,6 +307,10 @@
                 os.rmdir(mount_path)
             self.controller._wizard.do_reboot()
 
+    def set_page_title(self, title):
+        self.controller._wizard.page_title.set_markup(
+            '<span size="xx-large">%s</span>' % title)
+
     def plugin_on_next_clicked(self):
         reuse = self.reuse_partition.get_active()
         replace = self.replace_partition.get_active()
@@ -291,29 +318,62 @@
         custom = self.custom_partitioning.get_active()
         use_device = self.use_device.get_active()
         biggest_free = 'biggest_free' in self.extra_options
+        crypto = self.use_device.get_active()
+        one_disk = False
+
+        if custom:
+            self.set_page_title(self.custom_partitioning_title.get_text())
+            self.current_page = self.page_advanced
+            self.controller.go_to_page(self.current_page)
+            self.controller.toggle_next_button('install_button')
+            self.plugin_is_install = True
+            return False
+
+        # Setting the model early on, because if there is only one
+        # disk, we switch to install interface staight away and it
+        # queries the model to get the disk
+        m = self.part_auto_select_drive.get_model()
+        m.clear()
+        disks = self.extra_options['use_device'][1]
+        if len(disks) == 1:
+            one_disk = True
+        if use_device:
+            for disk in disks:
+                m.append([disk, ''])
+            self.part_auto_select_drive.set_active(0)
+
+        # Currently we support crypto only in use_disk
+        # 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.controller.go_to_page(self.current_page)
+            self.controller.toggle_next_button('install_button')
+            self.plugin_is_install = True
+            self.info_loop(None)
+            return True
+
+        if (self.current_page == self.page_crypto and
+            not self.get_crypto_keys()):
+            self.controller.allow_go_forward(False)
+            return True
 
         # We already have all that we need from the user.
-        done_partitioning = (resize and biggest_free) or reuse or replace
+        done_partitioning = \
+          (resize and biggest_free) or \
+          (use_device and one_disk) or \
+          reuse or replace
 
         if self.current_page == self.page_ask and not done_partitioning:
-            if custom:
-                title = self.custom_partitioning_title.get_text()
-            elif resize:
-                title = self.resize_use_free_title.get_text()
-            elif use_device:
-                title = self.use_device_title.get_text()
-            self.controller._wizard.page_title.set_markup(
-                '<span size="xx-large">%s</span>' % title)
-
-            if resize and 'wubi' in self.extra_options:
-                self.configure_wubi_and_reboot()
-                return True
-            elif resize:
-                m = self.part_auto_select_drive.get_model()
-                m.clear()
+            if resize:
+                self.set_page_title(self.resize_use_free_title.get_text())
+                if 'wubi' in self.extra_options:
+                    self.configure_wubi_and_reboot()
+                    return True
                 extra_resize = self.extra_options['resize']
                 disk_ids = list(extra_resize.keys())
-                disks = self.extra_options['use_device'][1]
                 # FIXME: perhaps it makes more sense to store the disk
                 # description.
                 for disk in disks:
@@ -325,32 +385,21 @@
                                   misc.format_size(part_size - min_size)])
                 self.part_auto_select_drive.set_active(0)
                 self.initialize_resize_mode()
-            elif use_device:
-                m = self.part_auto_select_drive.get_model()
-                m.clear()
-                for disk in self.extra_options['use_device'][1]:
-                    m.append([disk, ''])
-                self.part_auto_select_drive.set_active(0)
+
+            if use_device:
+                self.set_page_title(self.use_device_title.get_text())
                 self.initialize_use_disk_mode()
 
-            if not custom:
-                self.current_page = self.page_auto
-                self.controller.go_to_page(self.current_page)
-                self.controller.toggle_next_button('install_button')
-                self.plugin_is_install = True
-                return True
-            else:
-                self.current_page = self.page_advanced
-                self.controller.go_to_page(self.current_page)
-                self.controller.toggle_next_button('install_button')
-                self.plugin_is_install = True
-                return False
-        else:
-            # Return control to partman, which will call
-            # get_autopartition_choice and start partitioninging the device.
-            if not custom:
-                self.controller.switch_to_install_interface()
-            return False
+            self.current_page = self.page_auto
+            self.controller.go_to_page(self.current_page)
+            self.controller.toggle_next_button('install_button')
+            self.plugin_is_install = True
+            return True
+
+        # Return control to partman, which will call
+        # get_autopartition_choice and start partitioninging the device.
+        self.controller.switch_to_install_interface()
+        return False
 
     def plugin_on_back_clicked(self):
         if self.current_page == self.page_auto:
@@ -405,15 +454,6 @@
             hidden = self.controller.get_string('part_auto_hidden_label')
             self.part_auto_hidden_label.set_markup(hidden % partition_count)
 
-    def set_part_auto_recipes(self):
-        '''Shows experimental LVM option. TODO actually
-        check the available options from partman. '''
-
-        if 'UBIQUITY_PARTAUTO_LVM' in os.environ:
-            self.vbox_part_auto_recipes.show_all()
-        else:
-            self.vbox_part_auto_recipes.hide()
-
     def part_ask_option_is_install(self):
         if (self.reuse_partition.get_active() or
             self.replace_partition.get_active()):
@@ -437,6 +477,11 @@
                 self.controller.toggle_next_button()
             self.plugin_is_install = about_to_install
 
+        # Supporting crypto and lvm in new installs only for now
+        use_device = self.use_device.get_active()
+        self.use_lvm.set_sensitive(use_device)
+        self.use_crypto.set_sensitive(use_device)
+
     def initialize_resize_mode(self):
         disk_id = self.get_current_disk_partman_id()
         if not disk_id:
@@ -532,7 +577,6 @@
 
     def part_auto_select_drive_changed(self, unused_widget):
         self.set_part_auto_hidden_label()
-        self.set_part_auto_recipes()
         disk_id = self.get_current_disk_partman_id()
         if not disk_id:
             return
@@ -581,46 +625,56 @@
     def set_autopartition_options(self, options, extra_options):
         # TODO Need to select a radio button when resize isn't around.
         self.extra_options = extra_options
-
         fmt = '<span size="small">%s</span>'
-        self.use_device_title.set_label(options['use_device'].title)
-        self.use_device_desc.set_markup(fmt % options['use_device'].desc)
-        # To give a nice text effect.
-        self.use_device_desc.set_sensitive(False)
-        self.custom_partitioning_title.set_label(options['manual'].title)
-        self.custom_partitioning_desc.set_markup(fmt % options['manual'].desc)
-        self.custom_partitioning_desc.set_sensitive(False)
-
-        if 'replace' in options:
-            self.replace_partition.show()
-            self.replace_partition_title.set_label(options['replace'].title)
-            self.replace_partition_desc.set_markup(
-                fmt % options['replace'].desc)
-            self.replace_partition_desc.set_sensitive(False)
-        else:
-            self.replace_partition.hide()
-
-        if 'reuse' in options:
-            self.reuse_partition.show()
-            self.reuse_partition_title.set_markup(options['reuse'].title)
-            self.reuse_partition_desc.set_markup(fmt % options['reuse'].desc)
-            self.reuse_partition_desc.set_sensitive(False)
-        else:
-            self.reuse_partition.hide()
-
-        if 'resize' in options:
-            self.resize_use_free.show()
-            self.resize_use_free_title.set_label(options['resize'].title)
-            self.resize_use_free_desc.set_markup(fmt % options['resize'].desc)
-            self.resize_use_free_desc.set_sensitive(False)
-        else:
-            self.resize_use_free.hide()
-
-        for opt in (self.resize_use_free, self.reuse_partition,
-                    self.replace_partition, self.use_device):
-            if opt.get_property('visible'):
-                opt.set_active(True)
-                break
+        option_to_widget = OrderedDict({
+            "resize": "resize_use_free",
+            "reuse": "reuse_partition",
+            "replace": "replace_partition",
+            "use_device": "use_device",
+            "manual": "custom_partitioning",
+            "some_device_crypto": "use_crypto",
+            "some_device_lvm": "use_lvm",
+            })
+
+        if 'some_device_crypto' in extra_options:
+            title = self.controller.get_string(
+                'ubiquity/text/use_crypto_title')
+            desc = self.controller.get_string('ubiquity/text/use_crypto_desc')
+            options['some_device_crypto'] = PartitioningOption(title, desc)
+
+        if 'some_device_lvm' in extra_options:
+            title = self.controller.get_string('ubiquity/text/use_lvm_title')
+            desc = self.controller.get_string('ubiquity/text/use_lvm_desc')
+            options['some_device_lvm'] = PartitioningOption(title, desc)
+
+        for option in option_to_widget:
+            name = option_to_widget[option]
+            opt_widget = getattr(self, name)
+            opt_title = getattr(self, name + '_title')
+            opt_desc = getattr(self, name + '_desc')
+
+            if option in options:
+                opt_widget.show()
+                opt_title.set_label(options[option].title)
+                opt_desc.set_markup(fmt % options[option].desc)
+                opt_desc.set_sensitive(False)
+            else:
+                opt_widget.hide()
+
+            # dmitrij.ledkov 2012-07-23: Hide LVM from the UI, until
+            # we design user-friendly way of expressing this, or we
+            # switch to lvm installs by default....
+            if option == 'some_device_lvm':
+                if 'UBIQUITY_PARTAUTO_LVM' in os.environ:
+                    opt_widget.show()
+                else:
+                    opt_widget.hide()
+
+            if option == 'some_device_crypto':
+                if 'UBIQUITY_PARTAUTO_CRYPTO' in os.environ:
+                    opt_widget.show()
+                else:
+                    opt_widget.hide()
 
         # Process the default selection
         self.part_ask_option_changed(None)
@@ -649,15 +703,20 @@
 
         elif self.use_device.get_active():
             def choose_recipe():
-                # TODO dmitrij.ledkov 2012-07-10: To be extended with
-                # other complex recipes, e.g. stacking crypt & raid.
+                # TODO dmitrij.ledkov 2012-07-23: RAID recipe?
 
                 have_lvm = 'some_device_lvm' in self.extra_options
-
-                if 'UBIQUITY_PARTAUTO_LVM' not in os.environ or not have_lvm:
+                want_lvm = self.use_lvm.get_active()
+
+                have_crypto = 'some_device_crypto' in self.extra_options
+                want_crypto = self.use_crypto.get_active()
+
+                if not ((want_crypto and have_crypto) or
+                        (want_lvm and have_lvm)):
                     return self.extra_options['use_device'][0]
 
-                want_lvm = self.part_auto_use_lvm_checkbox.get_active()
+                if want_crypto:
+                    return self.extra_options['some_device_crypto']
 
                 if want_lvm:
                     return self.extra_options['some_device_lvm']
@@ -1379,6 +1438,25 @@
         self.part_advanced_warning_message.set_text(message)
         self.part_advanced_warning_hbox.show_all()
 
+    # Crypto Page
+    def info_loop(self, unused_widget):
+        complete = validation.gtk_password_validate(
+            self.controller,
+            self.auto_password,
+            self.auto_verified_password,
+            self.password_ok,
+            self.password_error_label,
+            self.password_strength
+            )
+        self.controller.allow_go_forward(complete)
+        return complete
+
+    def get_crypto_keys(self):
+        if self.info_loop(None):
+            return self.auto_password.get_text()
+        else:
+            return False
+
 
 class PageKde(PageBase):
     plugin_breadcrumb = 'ubiquity/text/breadcrumb_partition'
@@ -1530,7 +1608,10 @@
             '^partman/confirm.*',
             '^partman/free_space$',
             '^partman/active_partition$',
+            '^partman-crypto/passphrase.*',
+            '^partman-crypto/weak_passphrase$',
             '^partman-lvm/confirm.*',
+            '^partman-lvm/device_remove_lvm',
             '^partman-partitioning/new_partition_(size|type|place)$',
             '^partman-target/choose_method$',
             '^partman-basicfilesystems/'
@@ -1996,6 +2077,7 @@
         resize_option = ('resize' in self.extra_options or
                          'biggest_free' in self.extra_options)
 
+        # Irrespective of os_counts
         # We always have the manual partitioner, and it always has the same
         # title and description.
         q = 'ubiquity/partitioner/advanced'
@@ -2129,6 +2211,10 @@
                     self.description('partman-auto/text/resize_use_free')
                 self.manual_desc = \
                     self.description('partman-auto/text/custom_partitioning')
+                self.some_device_lvm_desc = \
+                    self.description('partman-auto-lvm/text/choice')
+                self.some_device_crypto_desc = \
+                    self.description('partman-auto-crypto/text/choice')
                 self.extra_options = {}
                 if choices:
                     self.auto_state = [0, None]
@@ -2249,6 +2335,18 @@
                     for option in replace:
                         self.extra_options['replace'].append(option[2])
 
+                some_device_lvm = self.find_script(menu_options,
+                                                   'some_device_lvm')
+                if some_device_lvm:
+                    self.extra_options['some_device_lvm'] = \
+                      self.some_device_lvm_desc
+
+                some_device_crypto = self.find_script(menu_options,
+                                                      'some_device_crypto')
+                if some_device_crypto:
+                    self.extra_options['some_device_crypto'] = \
+                      self.some_device_crypto_desc
+
             # We always have the manual option.
             self.extra_options['manual'] = self.manual_desc
             self.ui.set_disk_layout(layout)
@@ -2910,6 +3008,22 @@
             else:
                 raise AssertionError("Arrived at %s unexpectedly" % question)
 
+        elif question.startswith('partman-lvm/confirm') or \
+          question == 'partman-lvm/device_remove_lvm':
+            self.preseed_bool(question, True, seen=False)
+            self.succeeded = True
+            return True
+
+        elif question == 'partman-crypto/weak_passphrase':
+            self.preseed_bool(question, True, seen=False)
+            return True
+
+        elif question.startswith('partman-crypto/passphrase'):
+            if not self.ui.get_crypto_keys():
+                return False
+            self.preseed(question, self.ui.get_crypto_keys())
+            return True
+
         elif question.startswith('partman/confirm'):
             self.db.set('ubiquity/partman-confirm', question[8:])
             self.preseed(question, 'true', seen=False)
 
=== modified file 'ubiquity/plugins/ubi-usersetup.py'
--- ubiquity/plugins/ubi-usersetup.py	2012-07-16 14:29:13 +0000
+++ ubiquity/plugins/ubi-usersetup.py	2012-08-01 15:23:23 +0000
@@ -369,40 +369,17 @@
             self.username_error_label.hide()
             complete = False
 
-        passw = self.password.get_text()
-        vpassw = self.verified_password.get_text()
-        allow_empty = self.allow_password_empty
-        if passw != vpassw:
-            complete = False
-            self.password_ok.hide()
-            if passw and (len(vpassw) / float(len(passw)) > 0.8):
-                # TODO Cache, use a custom string.
-                txt = self.controller.get_string(
-                    'ubiquity/text/password_mismatch')
-                txt = (
-                    '<small>'
-                    '<span foreground="darkred"><b>%s</b></span>'
-                    '</small>' % txt)
-                self.password_error_label.set_markup(txt)
-                self.password_error_label.show()
-        else:
-            self.password_error_label.hide()
+        password_ok = validation.gtk_password_validate(
+            self.controller,
+            self.password,
+            self.verified_password,
+            self.password_ok,
+            self.password_error_label,
+            self.password_strength,
+            self.allow_password_empty,
+            )
 
-        if allow_empty:
-            self.password_strength.hide()
-        elif not passw:
-            self.password_strength.hide()
-            complete = False
-        else:
-            (txt, color) = validation.human_password_strength(passw)
-            # TODO Cache
-            txt = self.controller.get_string('ubiquity/text/password/' + txt)
-            txt = '<small><span foreground="%s"><b>%s</b></span></small>' \
-                  % (color, txt)
-            self.password_strength.set_markup(txt)
-            self.password_strength.show()
-            if passw == vpassw:
-                self.password_ok.show()
+        complete = complete and password_ok
 
         txt = self.hostname.get_text()
         self.hostname_ok.show()
 
=== modified file 'ubiquity/validation.py'
--- ubiquity/validation.py	2012-07-16 14:29:13 +0000
+++ ubiquity/validation.py	2012-08-01 15:23:23 +0000
@@ -140,3 +140,51 @@
         hint = 'strong'
         color = 'darkgreen'
     return (hint, color)
+
+
+# TODO dmitrij.ledkov 2012-07-23: factor-out further into generic
+# page/pagegtk/pagekde sub-widget
+def gtk_password_validate(controller,
+                          password,
+                          verified_password,
+                          password_ok,
+                          password_error_label,
+                          password_strength,
+                          allow_empty=False,
+                          ):
+    complete = True
+    passw = password.get_text()
+    vpassw = verified_password.get_text()
+    if passw != vpassw:
+        complete = False
+        password_ok.hide()
+        if passw and (len(vpassw) / float(len(passw)) > 0.8):
+            # TODO Cache, use a custom string.
+            txt = controller.get_string(
+                'ubiquity/text/password_mismatch')
+            txt = (
+                '<small>'
+                '<span foreground="darkred"><b>%s</b></span>'
+                '</small>' % txt)
+            password_error_label.set_markup(txt)
+            password_error_label.show()
+    else:
+        password_error_label.hide()
+
+    if allow_empty:
+        password_strength.hide()
+    elif not passw:
+        password_strength.hide()
+        complete = False
+    else:
+        (txt, color) = human_password_strength(passw)
+        # TODO Cache
+        txt = controller.get_string('ubiquity/text/password/' + txt)
+        txt = '<small><span foreground="%s"><b>%s</b></span></small>' \
+              % (color, txt)
+        password_strength.set_markup(txt)
+        password_strength.show()
+        if passw == vpassw:
+            password_ok.show()
+
+    return complete