From 99f3b67f3ffbf7a4f6ee311e3732a07250caf7c7 Mon Sep 17 00:00:00 2001
From: Mike Yuan <me@yhndnzj.com>
Date: Sat, 6 Apr 2024 02:06:38 +0800
Subject: [PATCH 1/2] os-util: use ENDSWITH_SET where appropriate

Addresses https://github.com/systemd/systemd/pull/31435#discussion_r1553969156

Co-authored-by: Lennart Poettering <lennart@poettering.net>
---
 src/basic/os-util.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/basic/os-util.c b/src/basic/os-util.c
index 985d89bc7e..0d26d189d1 100644
--- a/src/basic/os-util.c
+++ b/src/basic/os-util.c
@@ -72,16 +72,11 @@ int path_extract_image_name(const char *path, char **ret) {
         r = path_extract_filename(path, &fn);
         if (r < 0)
                 return r;
-
         if (r != O_DIRECTORY) {
-                /* Chop off any image suffixes we recognize (unless we already know this must refer to some dir */
-                FOREACH_STRING(suffix, ".sysext.raw", ".confext.raw", ".raw") {
-                        char *m = endswith(fn, suffix);
-                        if (m) {
-                                *m = 0;
-                                break;
-                        }
-                }
+                /* Chop off any image suffixes we recognize (unless we already know this must refer to some dir) */
+                char *m = ENDSWITH_SET(fn, ".sysext.raw", ".confext.raw", ".raw");
+                if (m)
+                        *m = 0;
         }
 
         /* Truncate the version/counting suffixes */

From 36b21fac8fb043364a4f1291fa009898ca56067c Mon Sep 17 00:00:00 2001
From: Mike Yuan <me@yhndnzj.com>
Date: Sat, 6 Apr 2024 02:10:17 +0800
Subject: [PATCH 2/2] sleep: rename SleepMemMode= to MemorySleepMode=

Addresses https://github.com/systemd/systemd/pull/31986#discussion_r1554053623
---
 man/systemd-sleep.conf.xml | 2 +-
 src/shared/sleep-config.c  | 2 +-
 src/sleep/sleep.conf       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
index 7a343975d7..623e614b6a 100644
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -196,7 +196,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><varname>SleepMemMode=</varname></term>
+        <term><varname>MemorySleepMode=</varname></term>
 
         <listitem><para>The string to be written to <filename>/sys/power/mem_sleep</filename>
         when <option>SuspendState=mem</option> or <command>hybrid-sleep</command> is used.
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index 4a90ad67bd..b8cd83c7c1 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -142,7 +142,7 @@ int parse_sleep_config(SleepConfig **ret) {
                 { "Sleep", "HybridSleepState",          config_parse_warn_compat, DISABLED_LEGACY, NULL                         },
                 { "Sleep", "HybridSleepMode",           config_parse_warn_compat, DISABLED_LEGACY, NULL                         },
 
-                { "Sleep", "SleepMemMode",              config_parse_sleep_mode,  0,               &sc->mem_modes               },
+                { "Sleep", "MemorySleepMode",           config_parse_sleep_mode,  0,               &sc->mem_modes               },
 
                 { "Sleep", "HibernateDelaySec",         config_parse_sec,         0,               &sc->hibernate_delay_usec    },
                 { "Sleep", "SuspendEstimationSec",      config_parse_sec,         0,               &sc->suspend_estimation_usec },
diff --git a/src/sleep/sleep.conf b/src/sleep/sleep.conf
index d12f97099a..98430348a7 100644
--- a/src/sleep/sleep.conf
+++ b/src/sleep/sleep.conf
@@ -23,6 +23,6 @@
 #AllowHybridSleep=yes
 #SuspendState=mem standby freeze
 #HibernateMode=platform shutdown
-#SleepMemMode=
+#MemorySleepMode=
 #HibernateDelaySec=
 #SuspendEstimationSec=60min