Skip to content

elogind: don't modify mem_sleep mode by default #58486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oreo639 merged 1 commit into from
Jan 13, 2026
Merged

elogind: don't modify mem_sleep mode by default #58486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions srcpkgs/elogind/patches/sleep.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Author: oreo639 <oreo6391@gmail.com>

Previously systemd implemented `SuspendMode` , which elogind extended to allow configuring mem_sleep modes such as s2idle or deep:
https://github.com/elogind/elogind/blob/v252.9/src/shared/sleep-config.c#L145-L146
https://github.com/elogind/elogind/blob/v252.9/src/sleep/sleep.c#L252-L287

The `SuspendMode` option was removed from systemd: https://github.com/elogind/elogind/commit/4d2820778f3e0904f9fab81654d4bd3ac1df7c8c

elogind re-added the option now including default mem_sleep options: https://github.com/elogind/elogind/commit/7707a30dfb2496a4c9c5939f0dd8bb39baebfecd https://github.com/elogind/elogind/commit/b409f71ac2f864f160dc872c54fa89b05a3a3bb7

Previously (in elogind versions we didn't ship), s2idle would be preferred when available which causes issues on laptops where deep is the better option (and the kernel default), in 255.22 this was changed to prefer deep, which conversely causes issues on newer laptops which advertise support for deep despite s2idle being the better option (and the kernel default): https://github.com/elogind/elogind/issues/285

Set the default sleep suspend mode to an empty list to skip modifying `/sys/power/mem_sleep` and preserve kernel defaults.

This should be fixed with elogind 257.x which drops `SuspendMode` configuration of mem_sleep in favor of systemd's newly added `MemorySleepMode`.

This is based on a similar patch in Chimera Linux (although modified to not remove the option outright): https://github.com/chimera-linux/cports/blob/9e7aff96579d41fcc1f411f88526ad7c132f8ec5/main/elogind/patches/sleep.patch

diff -rup sleep-config.c.orig sleep-config.c
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -45,7 +45,7 @@ static char* const* const sleep_default_
#if 0 /// elogind supports suspend modes (deep s2idle) so we need defaults, too
/* Not used by SLEEP_SUSPEND */
#else // 0
- [SLEEP_SUSPEND] = STRV_MAKE("deep", "s2idle"),
+ [SLEEP_SUSPEND] = STRV_MAKE_EMPTY,
#endif // 0
[SLEEP_HIBERNATE] = STRV_MAKE("platform", "shutdown"),
[SLEEP_HYBRID_SLEEP] = STRV_MAKE("suspend"),

5 changes: 3 additions & 2 deletions srcpkgs/elogind/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'elogind'
pkgname=elogind
version=255.22
revision=1
revision=2
build_style=meson
configure_args="-Dcgroup-controller=elogind -Ddefault-hierarchy=legacy
-Ddefault-kill-user-processes=false -Dhalt-path=/usr/bin/halt
Expand All @@ -18,7 +18,8 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
homepage="https://github.com/elogind/elogind"
distfiles="https://github.com/elogind/elogind/archive/refs/tags/V${version}.tar.gz"
checksum=79b5eb96bccf3a6101b35e62d0f80b2d0a47077a1507a6edc705f8cb7bdb0619
conf_files="/etc/elogind/*.conf"
conf_files="/etc/elogind/*.conf /etc/elogind/logind.conf.d/*.conf
/etc/elogind/sleep.conf.d/*.conf"
# tests fail differently due to containerization and kernel features
make_check=ci-skip

Expand Down