summarylogtreecommitdiffstats
path: root/0001-Add-a-critical-action-Ignore.patch
diff options
context:
space:
mode:
Diffstat (limited to '0001-Add-a-critical-action-Ignore.patch')
-rw-r--r--0001-Add-a-critical-action-Ignore.patch47
1 files changed, 17 insertions, 30 deletions
diff --git a/0001-Add-a-critical-action-Ignore.patch b/0001-Add-a-critical-action-Ignore.patch
index 6575a9b12e4f..3f0e6f888ff3 100644
--- a/0001-Add-a-critical-action-Ignore.patch
+++ b/0001-Add-a-critical-action-Ignore.patch
@@ -1,50 +1,37 @@
-From 1ba6e724dabf3a91e59b871750e22d420a4b1238 Mon Sep 17 00:00:00 2001
-From: Star Brilliant <m13253@hotmail.com>
-Date: Wed, 5 Oct 2016 22:02:36 +0800
-Subject: [PATCH] Add a critical action: Ignore
-
----
- etc/UPower.conf | 3 ++-
- src/linux/up-backend.c | 5 +++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/etc/UPower.conf b/etc/UPower.conf
-index e2c6a69..2bda528 100644
---- a/etc/UPower.conf
-+++ b/etc/UPower.conf
-@@ -88,7 +88,8 @@ TimeAction=120
- # PowerOff
+diff -rU3 upower.orig/etc/UPower.conf upower/etc/UPower.conf
+--- upower.orig/etc/UPower.conf 2024-05-06 13:57:43.520236008 +0200
++++ upower/etc/UPower.conf 2024-05-06 13:58:36.086904557 +0200
+@@ -96,8 +96,9 @@
# Hibernate
# HybridSleep
+ # Suspend (AllowRiskyCriticalPowerAction should be true to use this option but risky)
+# Ignore
#
+ # If Suspend isn't available or AllowRiskyCriticalPowerAction=false, HybridSleep will be used
# If HybridSleep isn't available, Hibernate will be used
# If Hibernate isn't available, PowerOff will be used
-CriticalPowerAction=HybridSleep
+CriticalPowerAction=Ignore
-diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
-index 2ba201a..ade64e9 100644
---- a/src/linux/up-backend.c
-+++ b/src/linux/up-backend.c
-@@ -392,6 +392,7 @@ up_backend_get_critical_action (UpBackend *backend)
+diff -rU3 upower.orig/src/linux/up-backend.c upower/src/linux/up-backend.c
+--- upower.orig/src/linux/up-backend.c 2024-05-06 13:57:43.523569342 +0200
++++ upower/src/linux/up-backend.c 2024-05-06 14:03:10.736914407 +0200
+@@ -557,6 +557,7 @@
{ "HybridSleep", "CanHybridSleep" },
{ "Hibernate", "CanHibernate" },
{ "PowerOff", NULL },
+ { "Ignore", NULL },
};
- guint i = 0;
- char *action;
-@@ -447,6 +448,10 @@ up_backend_take_action (UpBackend *backend)
+ g_autofree gchar *action = NULL;
+ gboolean can_risky = FALSE;
+@@ -622,6 +623,11 @@
method = up_backend_get_critical_action (backend);
g_assert (method != NULL);
-+ if (g_strcmp0 (method, "Ignore") == 0) {
-+ return;
-+ }
++ /* Do nothing if the action is set to "Ignore" */
++ if (g_strcmp0 (method, "Ignore") == 0) {
++ return;
++ }
+
/* Take action */
g_debug ("About to call logind method %s", method);
g_dbus_proxy_call (backend->priv->logind_proxy,
---
-2.10.0
-