ubiquity: fix ubiquity-dm erroring out due gsettings

2025-05-31 21:34:56 -06:00 · 2025-05-31 21:34:56 -06:00 · e9172f3598
commit e9172f3598
parent 1ba4ce84e1
6 changed files with 30 additions and 12 deletions
--- a/helpers/DATA/ubiquity/patch_changes/001-grub-installer.patch
+++ b/helpers/DATA/ubiquity/patch_changes/001-grub-installer.patch
--- a/helpers/DATA/ubiquity/patch_changes/002-no_confrirmation_when_crypto.patch
+++ b/helpers/DATA/ubiquity/patch_changes/002-no_confrirmation_when_crypto.patch
--- a/helpers/DATA/ubiquity/patch_changes/003-a11y.patch
+++ b/helpers/DATA/ubiquity/patch_changes/003-a11y.patch
--- a/helpers/DATA/ubiquity/patch_changes/004-crash_report_point_to_trisquel_forge.patch
+++ b/helpers/DATA/ubiquity/patch_changes/004-crash_report_point_to_trisquel_forge.patch
--- a/helpers/DATA/ubiquity/patch_changes/005-prevent_ubiquity-dm_error_due_missing_gsettings.patch
+++ b/helpers/DATA/ubiquity/patch_changes/005-prevent_ubiquity-dm_error_due_missing_gsettings.patch
@ -0,0 +1,21 @@
+# Present in first alpha Ecne ISO.
+
+diff --git a/bin/ubiquity-dm b/bin/ubiquity-dm
+index 67ffdb27..ea14e068 100755
+--- a/bin/ubiquity-dm
+++ b/bin/ubiquity-dm
+@@ -505,9 +505,11 @@ EndSection
+                     gsettings_keys.append(
+                         ('org.gnome.settings-daemon.plugins.background',
+                          'active', 'false'))
+-                    gsettings_keys.remove(
+-                        ('org.gnome.desktop.wm.preferences', 'num-workspaces',
+-                         '1'))
+                    # Prevent error out if settings aren't there
+                    key = ('org.gnome.desktop.wm.preferences', 'num-workspaces', '1')
+                    if key in gsettings_keys:
+                        gsettings_keys.remove(key)
+
+                     os.environ['XDG_SESSION_TYPE'] = 'x11'
+ 
+                 if (osextras.find_on_path('gnome-shell')):