From 941b750fae2d1564a6acaab2a93acec16fbe54c7 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 6 Sep 2022 18:22:59 +0200
Subject: [PATCH] Backport upstream fix to fix boot options (#2124043)

---
 2472.patch       | 30 ++++++++++++++++++++++++++++++
 gnome-shell.spec | 10 +++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 2472.patch

diff --git a/2472.patch b/2472.patch
new file mode 100644
index 0000000..99f6e57
--- /dev/null
+++ b/2472.patch
@@ -0,0 +1,30 @@
+From 6866af94832d55ca79162a6ccafdd00fc897bf41 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Tue, 6 Sep 2022 16:37:25 +0200
+Subject: [PATCH] loginManager: Fix canRebootToBootLoaderMenu() result
+
+Since commit a3db9093834, the `result` variable holds the
+destructured result of the D-Bus call, not the results array
+as previously.
+---
+ js/misc/loginManager.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/js/misc/loginManager.js b/js/misc/loginManager.js
+index 6549fe5adc..94d62e8192 100644
+--- a/js/misc/loginManager.js
++++ b/js/misc/loginManager.js
+@@ -164,8 +164,8 @@ var LoginManagerSystemd = class extends Signals.EventEmitter {
+ 
+         try {
+             const [result] = await this._proxy.CanRebootToBootLoaderMenuAsync();
+-            needsAuth = result[0] === 'challenge';
+-            canRebootToBootLoaderMenu = needsAuth || result[0] === 'yes';
++            needsAuth = result === 'challenge';
++            canRebootToBootLoaderMenu = needsAuth || result === 'yes';
+         } catch (error) {
+             canRebootToBootLoaderMenu = false;
+             needsAuth = false;
+-- 
+GitLab
+
diff --git a/gnome-shell.spec b/gnome-shell.spec
index 0499f98..dd6ae19 100644
--- a/gnome-shell.spec
+++ b/gnome-shell.spec
@@ -2,13 +2,18 @@
 
 Name:           gnome-shell
 Version:        43~rc
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 
 License:        GPLv2+
 URL:            https://wiki.gnome.org/Projects/GnomeShell
 Source0:        https://download.gnome.org/sources/gnome-shell/42/%{name}-%{tarball_version}.tar.xz
 
+# Backported from upstream
+# https://bugzilla.redhat.com/show_bug.cgi?id=2124043
+# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2472
+Patch0: 2472.patch
+
 # Replace Epiphany with Firefox in the default favourite apps list
 Patch10001: gnome-shell-favourite-apps-firefox.patch
 
@@ -231,6 +236,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/evolution-calendar.de
 %{_mandir}/man1/gnome-shell.1*
 
 %changelog
+* Tue Sep 06 2022 Kalev Lember <klember@redhat.com> - 43~rc-2
+- Backport upstream fix to fix boot options (#2124043)
+
 * Sun Sep 04 2022 Florian Müllner <fmuellner@redhat.com> - 43~rc-1
 - Update to 43.rc