From 07fccf9b7404297bd78dd5f8d7430b5e5eada5e0 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Mon, 6 Mar 2023 13:41:25 -0500
Subject: [PATCH] ubiquity: Disable confirmation popups
---
.../ubiquity/no_confrirmation_when_crypto.patch | 16 ++++++++++++++++
helpers/make-ubiquity | 6 +++---
2 files changed, 19 insertions(+), 3 deletions(-)
create mode 100644 helpers/DATA/ubiquity/no_confrirmation_when_crypto.patch
diff --git a/helpers/DATA/ubiquity/no_confrirmation_when_crypto.patch b/helpers/DATA/ubiquity/no_confrirmation_when_crypto.patch
new file mode 100644
index 000000000..cbaff8379
--- /dev/null
+++ b/helpers/DATA/ubiquity/no_confrirmation_when_crypto.patch
@@ -0,0 +1,16 @@
+diff --git a/ubiquity/plugins/ubi-partman.py b/ubiquity/plugins/ubi-partman.py
+index fc3f8c2a9e..c441f59cad 100644
+--- a/ubiquity/plugins/ubi-partman.py
++++ b/ubiquity/plugins/ubi-partman.py
+@@ -3421,6 +3421,11 @@ class Page(plugin.Plugin):
+ elif question.startswith('partman/confirm'):
+ description = self.extended_description(question)
+
++ self.preseed(question, 'true', seen=False)
++ self.succeeded = True
++ self.done = True
++ return True
++
+ if hasattr(self.ui, "use_zfs"):
+ if (self.ui.use_zfs.get_active() and self.ui.use_device.get_active()):
+ description = self.update_zfs_description(self.extended_description(question))
diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity
index 697f3f489..07194e04f 100644
--- a/helpers/make-ubiquity
+++ b/helpers/make-ubiquity
@@ -18,12 +18,12 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=32
+VERSION=33
. ./config
-# Enable full disk encryption by default. Disabled, as it hinders a11y and sighted people can choose to enable it.
-#patch -p0 < $DATA/nabia_encrypt_by_default.patch
+# Disable confirmation popups, as they are innacurate and buggy
+patch -p1 < $DATA/no_confrirmation_when_crypto.patch
# Fix some gtk labels for Orca
patch -p1 < $DATA/a11y.patch
--
GitLab