From: Mike Yuan <me@yhndnzj.com>
Date: Fri, 5 Apr 2024 18:10:17 +0000 (+0800)
Subject: sleep: rename SleepMemMode= to MemorySleepMode=
X-Git-Tag: v256-rc1~293^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36b21fac8fb043364a4f1291fa009898ca56067c;p=thirdparty%2Fsystemd.git

sleep: rename SleepMemMode= to MemorySleepMode=

Addresses https://github.com/systemd/systemd/pull/31986#discussion_r1554053623
---

diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
index 7a343975d75..623e614b6ab 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 4a90ad67bd0..b8cd83c7c1e 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 d12f97099af..98430348a7b 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