1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
|
From 2b522bb0cd3872107335459d82b92f73f6a50bf7 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Tue, 12 Nov 2024 23:43:16 +0100
Subject: [PATCH 1/2] Revert "Re-Add sleep mode configuration"
This reverts commit 7707a30dfb2496a4c9c5939f0dd8bb39baebfecd.
---
src/shared/sleep-config.c | 8 --------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 053e908e6..5ddcb006f 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -42,11 +42,7 @@ static char* const* const sleep_default_state_table[_SLEEP_OPERATION_CONFIG_MAX]
};
static char* const* const sleep_default_mode_table[_SLEEP_OPERATION_CONFIG_MAX] = {
-#if 0 /// elogind supports suspend modes (deep s2idle) so we need defaults, too
/* Not used by SLEEP_SUSPEND */
-#else // 0
- [SLEEP_SUSPEND] = STRV_MAKE("s2idle", "deep"),
-#endif // 0
[SLEEP_HIBERNATE] = STRV_MAKE("platform", "shutdown"),
[SLEEP_HYBRID_SLEEP] = STRV_MAKE("suspend"),
};
@@ -172,11 +168,7 @@ int parse_sleep_config(SleepConfig **ret) {
{ "Sleep", "AllowHybridSleep", config_parse_tristate, 0, &allow_hybrid_sleep },
{ "Sleep", "SuspendState", config_parse_strv, 0, sc->states + SLEEP_SUSPEND },
-#if 0 /// elogind does support suspend modes
{ "Sleep", "SuspendMode", config_parse_warn_compat, DISABLED_LEGACY, NULL },
-#else // 0
- { "Sleep", "SuspendMode", config_parse_sleep_mode, 0, sc->modes + SLEEP_SUSPEND },
-#endif // 0
{ "Sleep", "HibernateState", config_parse_warn_compat, DISABLED_LEGACY, NULL },
{ "Sleep", "HibernateMode", config_parse_sleep_mode, 0, sc->modes + SLEEP_HIBERNATE },
--
2.47.0
From 10a451df4259113738f0839e09041742dd8ccbc2 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Tue, 12 Nov 2024 23:47:19 +0100
Subject: [PATCH 2/2] Revert "Re-add elogind additions to sleep.conf loading
and split those into sleep.donf.d/10-elogind.conf"
This reverts commit c5e7ba0c47ae95e2cf6fd48dc9353e8f333200c4.
---
src/shared/sleep-config.c | 9 ---------
src/sleep/10-elogind.conf | 22 ----------------------
src/sleep/meson.build | 4 ----
src/sleep/sleep.conf | 9 +++++++++
4 files changed, 9 insertions(+), 35 deletions(-)
delete mode 100644 src/sleep/10-elogind.conf
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 5ddcb006f..097c203ca 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -153,15 +153,6 @@ int parse_sleep_config(SleepConfig **ret) {
#endif // 0
const ConfigTableItem items[] = {
-#if 1 /// Additional options for elogind
- { "Sleep", "AllowPowerOffInterrupts", config_parse_bool, 0, &sc->allow_poweroff_interrupts },
- { "Sleep", "BroadcastPowerOffInterrupts", config_parse_bool, 0, &sc->broadcast_poweroff_interrupts },
- { "Sleep", "AllowSuspendInterrupts", config_parse_bool, 0, &sc->allow_suspend_interrupts },
- { "Sleep", "BroadcastSuspendInterrupts", config_parse_bool, 0, &sc->broadcast_suspend_interrupts },
- { "Sleep", "HandleNvidiaSleep", config_parse_bool, 0, &sc->handle_nvidia_sleep },
- { "Sleep", "SuspendByUsing", config_parse_strv, 0, &sc->suspend_by_using },
- { "Sleep", "HibernateByUsing", config_parse_strv, 0, &sc->hibernate_by_using },
-#endif // 1
{ "Sleep", "AllowSuspend", config_parse_tristate, 0, &allow_suspend },
{ "Sleep", "AllowHibernation", config_parse_tristate, 0, &allow_hibernate },
{ "Sleep", "AllowSuspendThenHibernate", config_parse_tristate, 0, &allow_s2h },
diff --git a/src/sleep/10-elogind.conf b/src/sleep/10-elogind.conf
deleted file mode 100644
index b8b3350b1..000000000
--- a/src/sleep/10-elogind.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file is part of elogind.
-#
-# elogind is free software; you can redistribute it and/or modify it under the
-# terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; either version 2.1 of the License, or (at your option)
-# any later version.
-#
-# Entries in this file show the compile time defaults specific to eloging.
-# Local configuration should be created here with a higher leading number so
-# they are parsed later overriding the defaults.
-#
-# See sleep.conf(5) for details.
-
-[Sleep]
-#AllowPowerOffInterrupts=no
-#AllowSuspendInterrupts=no
-#BroadcastPowerOffInterrupts=yes
-#BroadcastSuspendInterrupts=yes
-#HandleNvidiaSleep=no
-#HibernateByUsing=
-#SuspendByUsing=
-#SuspendMode=s2idle deep
diff --git a/src/sleep/meson.build b/src/sleep/meson.build
index c711a1b5c..3b06a6e91 100644
--- a/src/sleep/meson.build
+++ b/src/sleep/meson.build
@@ -28,8 +28,4 @@ sleep_files = files(
if install_sysconfdir_samples
install_data('sleep.conf',
install_dir : pkgconfigfiledir)
-#if 1 /// elogind comes with a first drop-in representing its defaults
- install_data('10-elogind.conf',
- install_dir : pkgconfigfiledir / 'sleep.conf.d' )
-#endif // 1
endif
diff --git a/src/sleep/sleep.conf b/src/sleep/sleep.conf
index ea048892b..b71790711 100644
--- a/src/sleep/sleep.conf
+++ b/src/sleep/sleep.conf
@@ -23,3 +23,12 @@
#HibernateMode=platform shutdown
#HibernateDelaySec=
#SuspendEstimationSec=60min
+
+# elogind additions
+#AllowPowerOffInterrupts=no
+#BroadcastPowerOffInterrupts=yes
+#AllowSuspendInterrupts=no
+#BroadcastSuspendInterrupts=yes
+#SuspendByUsing=
+#HibernateByUsing=
+#HandleNvidiaSleep=no
--
2.47.0
|
