Backport upstream fix to fix boot options (#2124043)
This commit is contained in:
parent
9b9265d299
commit
941b750fae
30
2472.patch
Normal file
30
2472.patch
Normal file
@ -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
|
||||||
|
|
@ -2,13 +2,18 @@
|
|||||||
|
|
||||||
Name: gnome-shell
|
Name: gnome-shell
|
||||||
Version: 43~rc
|
Version: 43~rc
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Window management and application launching for GNOME
|
Summary: Window management and application launching for GNOME
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://wiki.gnome.org/Projects/GnomeShell
|
URL: https://wiki.gnome.org/Projects/GnomeShell
|
||||||
Source0: https://download.gnome.org/sources/gnome-shell/42/%{name}-%{tarball_version}.tar.xz
|
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
|
# Replace Epiphany with Firefox in the default favourite apps list
|
||||||
Patch10001: gnome-shell-favourite-apps-firefox.patch
|
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*
|
%{_mandir}/man1/gnome-shell.1*
|
||||||
|
|
||||||
%changelog
|
%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
|
* Sun Sep 04 2022 Florian Müllner <fmuellner@redhat.com> - 43~rc-1
|
||||||
- Update to 43.rc
|
- Update to 43.rc
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user