Compare commits
No commits in common. "ea6b7152659f432f1cf526525bafb14ce1d78ddb" and "abf194ec237bff219d6b47ea716624a6c9fc693c" have entirely different histories.
ea6b715265
...
abf194ec23
@ -1,53 +0,0 @@
|
|||||||
From fbe9b7dba44cb284f649a1e916b2cf3ce8281211 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Benjamin Berg <bberg@redhat.com>
|
|
||||||
Date: Tue, 7 May 2019 15:40:20 +0200
|
|
||||||
Subject: [PATCH] power: Only disable Suspend/Hibernate actions inside VM
|
|
||||||
|
|
||||||
While we theoretically only want a different default value inside a VM,
|
|
||||||
we currently hack this by never doing a suspend action inside VMs.
|
|
||||||
However, that also breaks automatic logout, which is an unintended side
|
|
||||||
effect.
|
|
||||||
|
|
||||||
Move the check to not install the corresponding timeout (preventing
|
|
||||||
sleep warnings from being displayed) and also only enforce the VM
|
|
||||||
specific hack for the Suspend and Hibernate actions.
|
|
||||||
---
|
|
||||||
plugins/power/gsd-power-manager.c | 15 ++++++++-------
|
|
||||||
1 file changed, 8 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
|
|
||||||
index f965f6f..dbaa262 100644
|
|
||||||
--- a/plugins/power/gsd-power-manager.c
|
|
||||||
+++ b/plugins/power/gsd-power-manager.c
|
|
||||||
@@ -1520,13 +1520,6 @@ idle_set_mode (GsdPowerManager *manager, GsdPowerIdleMode mode)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
- /* don't do any power saving if we're a VM */
|
|
||||||
- if (manager->priv->is_virtual_machine) {
|
|
||||||
- g_debug ("ignoring state transition to %s as virtual machine",
|
|
||||||
- idle_mode_to_string (mode));
|
|
||||||
- return;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
manager->priv->current_idle_mode = mode;
|
|
||||||
g_debug ("Doing a state transition: %s", idle_mode_to_string (mode));
|
|
||||||
|
|
||||||
@@ -1727,6 +1720,14 @@ idle_configure (GsdPowerManager *manager)
|
|
||||||
clear_idle_watch (manager->priv->idle_monitor,
|
|
||||||
&manager->priv->idle_sleep_warning_id);
|
|
||||||
|
|
||||||
+ /* don't do any power saving if we're a VM */
|
|
||||||
+ if (manager->priv->is_virtual_machine &&
|
|
||||||
+ (action_type == GSD_POWER_ACTION_SUSPEND ||
|
|
||||||
+ action_type == GSD_POWER_ACTION_HIBERNATE)) {
|
|
||||||
+ g_debug ("Ignoring sleep timeout with suspend action inside VM");
|
|
||||||
+ timeout_sleep = 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
if (timeout_sleep != 0) {
|
|
||||||
g_debug ("setting up sleep callback %is", timeout_sleep);
|
|
||||||
|
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
Name: gnome-settings-daemon
|
Name: gnome-settings-daemon
|
||||||
Version: 3.32.0
|
Version: 3.32.0
|
||||||
Release: 16%{?dist}.alma
|
Release: 14%{?dist}.alma
|
||||||
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
|
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -118,8 +118,6 @@ Patch50016: 0016-subman-Update-POTFILES.in.patch
|
|||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1876291
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1876291
|
||||||
Patch50017: 0017-Update-translations.patch
|
Patch50017: 0017-Update-translations.patch
|
||||||
|
|
||||||
Patch60001: 0001-power-Only-disable-Suspend-Hibernate-actions-inside-.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
A daemon to share settings from GNOME to other applications. It also
|
A daemon to share settings from GNOME to other applications. It also
|
||||||
handles global keybindings, as well as a number of desktop-wide settings.
|
handles global keybindings, as well as a number of desktop-wide settings.
|
||||||
@ -143,8 +141,6 @@ developing applications that use %{name}.
|
|||||||
%patch20001 -p 1
|
%patch20001 -p 1
|
||||||
%patch30001 -p 1
|
%patch30001 -p 1
|
||||||
%patch40001 -p 1
|
%patch40001 -p 1
|
||||||
%patch50017 -p 1
|
|
||||||
%patch60001 -p 1
|
|
||||||
|
|
||||||
%if %{with subman}
|
%if %{with subman}
|
||||||
%patch50001 -p 1
|
%patch50001 -p 1
|
||||||
@ -163,6 +159,7 @@ developing applications that use %{name}.
|
|||||||
%patch50014 -p 1
|
%patch50014 -p 1
|
||||||
%patch50015 -p 1
|
%patch50015 -p 1
|
||||||
%patch50016 -p 1
|
%patch50016 -p 1
|
||||||
|
%patch50017 -p 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -282,17 +279,9 @@ mkdir $RPM_BUILD_ROOT%{_libdir}/gnome-settings-daemon-3.0/gtk-modules
|
|||||||
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
|
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Nov 09 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 3.32.0-16.alma
|
* Wed May 19 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 3.32.0-14.alma
|
||||||
- Disable subman plugin
|
- Disable subman plugin
|
||||||
|
|
||||||
* Fri Sep 10 2021 Kalev Lember <klember@redhat.com> - 3.32.0-16
|
|
||||||
- Update pt_BR translations
|
|
||||||
- Resolves: #1978612
|
|
||||||
|
|
||||||
* Fri Aug 06 2021 Carlos Garnacho <cgarnach@redhat.com> - 3.32.0-15
|
|
||||||
- Keep auto-logout working inside VMs
|
|
||||||
Resolves: #1904139
|
|
||||||
|
|
||||||
* Mon Mar 01 2021 Kalev Lember <klember@redhat.com> - 3.32.0-14
|
* Mon Mar 01 2021 Kalev Lember <klember@redhat.com> - 3.32.0-14
|
||||||
- Update fr, ja, zh_CN translations
|
- Update fr, ja, zh_CN translations
|
||||||
- Resolves: #1876291
|
- Resolves: #1876291
|
||||||
|
Loading…
Reference in New Issue
Block a user