Merge lp:~tsimonq2/ubiquity/remove-encrypt_home-qt into lp:ubiquity

[Simon Quigley]

Remove encrypt_home from the Qt frontend.

Following the lead of the GTK frontend, remove the encrypted home directory option from the Qt installer since ecryptfs no longer has support from the Ubuntu Security Team. This removes the frontend but keeps the codebase for the option so it can be added back later using another technology.

Kubuntu considers this release-critical.

[Simon Quigley (tsimonq2)]

Apparently someone was kool and filed this already in bug 1761396 but I didn't link that in the changelog.

[lp:~tsimonq2/ubiquity/remove-encrypt_home-qt]

6618. By Simon Quigley on 2018-04-22

Add bug report in the changelog.

[Steve Langasek (vorlon)]

Uploading this; installer team, please merge this (picking up the resolution to the merge conflicts from the archive).

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-20 21:11:32 +0000
+++ debian/changelog	2018-04-22 04:39:16 +0000
@@ -1,3 +1,13 @@
+ubiquity (18.04.10) bionic; urgency=medium
+
+  * Following the lead of the GTK frontend, remove the encrypted home
+    directory option from the Qt installer since ecryptfs no longer has
+    support from the Ubuntu Security Team. This removes the frontend but keeps
+    the codebase for the option so it can be added back later using another
+    technology (LP: #1761396).
+
+ -- Simon Quigley <[e-mail]>  Sat, 21 Apr 2018 21:15:49 -0500
+
 ubiquity (18.04.9) bionic; urgency=medium
 
   * Detect the proper name for zram in /proc/swaps (LP: #1763611).

=== modified file 'debian/ubiquity.templates'
--- debian/ubiquity.templates	2018-04-13 17:37:47 +0000
+++ debian/ubiquity.templates	2018-04-22 04:39:16 +0000
@@ -221,10 +221,6 @@
 Type: text
 _Description: Require my password to log in
 
-Template: ubiquity/text/login_encrypt
-Type: text
-_Description: Encrypt my home folder
-
 Template: ubiquity/text/part_auto_heading_label
 Type: text
 _Description: Installation type

=== modified file 'gui/qt/stepUserSetup.ui'
--- gui/qt/stepUserSetup.ui	2015-09-08 16:16:32 +0000
+++ gui/qt/stepUserSetup.ui	2018-04-22 04:39:16 +0000
@@ -536,16 +536,6 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="login_encrypt">
-        <property name="text">
-         <string>Require Password and decrypt home to login</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -572,7 +562,6 @@
   <tabstop>hostname</tabstop>
   <tabstop>login_pass</tabstop>
   <tabstop>login_auto</tabstop>
-  <tabstop>login_encrypt</tabstop>
  </tabstops>
  <resources/>
  <connections/>

=== modified file 'ubiquity/plugins/ubi-usersetup.py'
--- ubiquity/plugins/ubi-usersetup.py	2018-02-28 14:58:37 +0000
+++ ubiquity/plugins/ubi-usersetup.py	2018-04-22 04:39:16 +0000
@@ -456,7 +456,6 @@
             self.page.username.setEnabled(False)
             self.page.login_pass.hide()
             self.page.login_auto.hide()
-            self.page.login_encrypt.hide()
             self.username_edited = True
             self.hostname_edited = True
 
@@ -541,22 +540,20 @@
         return self.page.login_auto.isChecked()
 
     def on_login_pass_clicked(self, checked):
-        self.page.login_encrypt.setEnabled(checked)
+        print("Ecryptfs is deprecated")
 
     def on_login_auto_clicked(self, checked):
-        self.page.login_encrypt.setChecked(not(checked))
-        self.page.login_encrypt.setEnabled(not(checked))
+        print("Ecryptfs is deprecated")
 
     def set_encrypt_home(self, value):
-        self.page.login_encrypt.setChecked(value)
+        print("Ecryptfs is deprecated")
 
     def set_force_encrypt_home(self, value):
-        self.page.login_encrypt.setDisabled(value)
-        self.page.login_auto.setDisabled(value)
-        self.page.login_pass.setDisabled(value)
+        print("Ecryptfs is deprecated")
 
+    # Ecryptfs is deprecated
     def get_encrypt_home(self):
-        return self.page.login_encrypt.isChecked()
+        return False
 
     def username_error(self, msg):
         self.page.username_error_reason.setText(msg)