From 7e8838fa7cb979c51a1a11937ea64d97388cab50 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 9 May 2023 10:15:59 +0000 Subject: [PATCH] import gnome-settings-daemon-40.0.1-11.el9_2 --- ...n-action-always-power-off-when-chass.patch | 45 ------------------- SPECS/gnome-settings-daemon.spec | 7 ++- 2 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 SOURCES/0001-Make-power-button-action-always-power-off-when-chass.patch diff --git a/SOURCES/0001-Make-power-button-action-always-power-off-when-chass.patch b/SOURCES/0001-Make-power-button-action-always-power-off-when-chass.patch deleted file mode 100644 index baac87c..0000000 --- a/SOURCES/0001-Make-power-button-action-always-power-off-when-chass.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a94fd3a1a055c55f96adb1482cb96c7a541af7dd Mon Sep 17 00:00:00 2001 -From: Felipe Borges -Date: Wed, 15 Feb 2023 15:27:59 +0100 -Subject: [PATCH] Make power-button-action always power off when chassis=server - -Servers often don't support hibernation/suspend. ---- - .../org.gnome.settings-daemon.plugins.power.gschema.xml.in | 2 +- - plugins/media-keys/gsd-media-keys-manager.c | 7 ++++--- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in -index e1a8787b..ef0ea530 100644 ---- a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in -+++ b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in -@@ -39,7 +39,7 @@ - - 'suspend' - Power button action -- The action to take when the system power button is pressed. Virtual machines only honor the 'nothing' action, and will shutdown otherwise. Tablets always suspend, ignoring all the other action options. -+ The action to take when the system power button is pressed. Virtual machines and servers only honor the 'nothing' action, and will shutdown otherwise. Tablets always suspend, ignoring all the other action options. - - - true -diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c -index 60ff2ced..26d0e438 100644 ---- a/plugins/media-keys/gsd-media-keys-manager.c -+++ b/plugins/media-keys/gsd-media-keys-manager.c -@@ -2042,9 +2042,10 @@ do_config_power_button_action (GsdMediaKeysManager *manager, - return; - - action_type = g_settings_get_enum (priv->power_settings, "power-button-action"); -- /* Always power off VMs, except when power-button-action is "nothing" */ -- if (g_strcmp0 (priv->chassis_type, "vm") == 0) { -- g_warning_once ("Virtual machines only honor the 'nothing' power-button-action, and will shutdown otherwise"); -+ /* Always power off VMs and servers, except when power-button-action is "nothing" */ -+ if (g_strcmp0 (priv->chassis_type, "vm") == 0 || -+ g_strcmp0 (priv->chassis_type, "server")) { -+ g_warning ("Virtual machines only honor the 'nothing' power-button-action, and will shutdown otherwise"); - - if (action_type != GSD_POWER_BUTTON_ACTION_NOTHING) - power_action (manager, "PowerOff", FALSE); --- -2.37.1 - diff --git a/SPECS/gnome-settings-daemon.spec b/SPECS/gnome-settings-daemon.spec index 9e95b15..327d12e 100644 --- a/SPECS/gnome-settings-daemon.spec +++ b/SPECS/gnome-settings-daemon.spec @@ -11,7 +11,7 @@ Name: gnome-settings-daemon Version: 40.0.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications License: GPLv2+ @@ -72,7 +72,6 @@ Patch00002: subscription-manager-support.patch Patch00003: im-module-setting-fix.patch Patch00004: print-notifications-clear-in-stop.patch Patch00005: 0001-power-Respect-the-nothing-power-button-action-for-VM.patch -Patch00006: 0001-Make-power-button-action-always-power-off-when-chass.patch %description A daemon to share settings from GNOME to other applications. It also @@ -198,6 +197,10 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas %{_libdir}/pkgconfig/gnome-settings-daemon.pc %changelog +* Tue Mar 28 2023 Felipe Borges - 40.0.1-11 +- Revert "power-button-action" always poweroff on Server chassis + Resolves: #2182380 + * Wed Feb 22 2023 Felipe Borges - 40.0.1-10 - Default power-button-action to poweroff on servers (except when power-button-action=nothing)