ubiquity: disable ecryptfs in favor of full disk encryption

helpers/make-ubiquity

@@ -17,11 +17,14 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=4
+VERSION=5
 
 . ./config
 
+# Enable full disk encryption by default
 patch -p1 < $DATA/encrypt_by_default.patch
+# Disable ecryptfs, it is confusing to offer both and full disk encryption is safer
+sed '/login_encrypt/,/visible/s/True/False/' -i ./gui/gtk/stepUserInfo.ui
 
 cp $DATA/trisquel_installed.png pixmaps
 rm pixmaps/ubuntu_installed.png