diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 25d4d3a1b2..1139c510e7 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -179,7 +179,7 @@
suspend,
hibernate,
hybrid-sleep,
- suspend-to-hibernate, and
+ suspend-then-hibernate, and
lock.
Defaults to ignore.
@@ -229,7 +229,7 @@
suspend,
hibernate,
hybrid-sleep,
- suspend-to-hibernate, and
+ suspend-then-hibernate, and
lock.
If ignore, logind will never handle these
keys. If lock, all running sessions will be
diff --git a/man/rules/meson.build b/man/rules/meson.build
index 878f560681..1cce1043bf 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -628,7 +628,7 @@ manpages = [
'8',
['systemd-hibernate.service',
'systemd-hybrid-sleep.service',
- 'systemd-suspend-to-hibernate.service',
+ 'systemd-suspend-then-hibernate.service',
'systemd-sleep'],
''],
['systemd-sysctl.service', '8', ['systemd-sysctl'], ''],
diff --git a/man/systemd-sleep.conf.xml b/man/systemd-sleep.conf.xml
index 6ad9ff4b2b..3d94a45e41 100644
--- a/man/systemd-sleep.conf.xml
+++ b/man/systemd-sleep.conf.xml
@@ -104,7 +104,7 @@
- suspend-to-hibernate
+ suspend-then-hibernate
A low power state where the system is initially suspended
(the state is stored in RAM). If not interrupted within the delay specified by
@@ -147,7 +147,7 @@
systemd-suspend.service8,
systemd-hibernate.service8,
systemd-hybrid-sleep.service8, or
- systemd-suspend-to-hibernate.service8.
+ systemd-suspend-then-hibernate.service8.
More than one value can be specified by separating
multiple values with whitespace. They will be tried
in turn, until one is written without error. If
@@ -166,7 +166,7 @@
systemd-suspend.service8,
systemd-hibernate.service8,
systemd-hybrid-sleep.service8, or
- systemd-suspend-to-hibernate.service8.
+ systemd-suspend-then-hibernate.service8.
More than one value can be specified by separating
multiple values with whitespace. They will be tried
in turn, until one is written without error. If
@@ -179,7 +179,7 @@
The amount of time in seconds
that will pass before the system is automatically
put into hibernate when using
- systemd-suspend-to-hibernate.service8.
+ systemd-suspend-then-hibernate.service8.
@@ -202,7 +202,7 @@ SuspendState=freeze
systemd-suspend.service8,
systemd-hibernate.service8,
systemd-hybrid-sleep.service8,
- systemd-suspend-to-hibernate.service8,
+ systemd-suspend-then-hibernate.service8,
systemd1,
systemd.directives7
diff --git a/man/systemd-suspend.service.xml b/man/systemd-suspend.service.xml
index 2455baa905..8b9a11cb89 100644
--- a/man/systemd-suspend.service.xml
+++ b/man/systemd-suspend.service.xml
@@ -50,7 +50,7 @@
systemd-suspend.service
systemd-hibernate.service
systemd-hybrid-sleep.service
- systemd-suspend-to-hibernate.service
+ systemd-suspend-then-hibernate.service
systemd-sleep
System sleep state logic
@@ -59,7 +59,7 @@
systemd-suspend.service
systemd-hibernate.service
systemd-hybrid-sleep.service
- systemd-suspend-to-hibernate.service
+ systemd-suspend-then-hibernate.service
/usr/lib/systemd/system-sleep
@@ -75,7 +75,7 @@
systemd-hybrid-sleep.service is pulled in by
hybrid-sleep.target to execute hybrid
hibernation with system suspend and pulled in by
- suspend-to-hibernate.target to execute system suspend
+ suspend-then-hibernate.target to execute system suspend
with a timeout that will activate hibernate later.
Immediately before entering system suspend and/or
@@ -85,7 +85,7 @@
arguments to them. The first argument will be
pre, the second either
suspend, hibernate,
- hybrid-sleep, or suspend-to-hibernate
+ hybrid-sleep, or suspend-then-hibernate
depending on the chosen action.
Immediately after leaving system suspend and/or hibernation the
same executables are run, but the first argument is now
@@ -105,7 +105,7 @@
systemd-suspend.service,
systemd-hibernate.service, and
systemd-hybrid-sleep.service
- systemd-suspend-to-hibernate.service
+ systemd-suspend-then-hibernate.service
should never be executed directly. Instead, trigger system sleep
states with a command such as systemctl suspend
or similar.
@@ -134,9 +134,9 @@
-
+
- Suspend, hibernate, suspend to hibernate, or put the
+ Suspend, hibernate, suspend then hibernate, or put the
system to hybrid sleep.
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 95e2ffc0b5..7bf674e9cc 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -65,7 +65,7 @@
halt.target,
hibernate.target,
hybrid-sleep.target,
- suspend-to-hibernate.target,
+ suspend-then-hibernate.target,
initrd-fs.target,
initrd-root-device.target,
initrd-root-fs.target,
@@ -309,7 +309,7 @@
- suspend-to-hibernate.target
+ suspend-then-hibernate.target
A special target unit for suspending the system for a period
of time, waking it and putting it into hibernate. This pulls in
diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in
index de2648a96c..c3b97695f1 100644
--- a/shell-completion/bash/systemctl.in
+++ b/shell-completion/bash/systemctl.in
@@ -206,7 +206,7 @@ _systemctl () {
[ENVS]='set-environment unset-environment import-environment'
[STANDALONE]='daemon-reexec daemon-reload default
emergency exit halt hibernate hybrid-sleep
- suspend-to-hibernate kexec list-jobs list-sockets
+ suspend-then-hibernate kexec list-jobs list-sockets
list-timers list-units list-unit-files poweroff
reboot rescue show-environment suspend get-default
is-system-running preset-all'
diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in
index ca0744457b..6957a848c3 100644
--- a/shell-completion/zsh/_systemctl.in
+++ b/shell-completion/zsh/_systemctl.in
@@ -18,7 +18,7 @@
"force-reload:Reload one or more units if possible, otherwise restart if active"
"hibernate:Hibernate the system"
"hybrid-sleep:Hibernate and suspend the system"
- "suspend-to-hibernate:Suspend the system for a period of time, and then hibernate it"
+ "suspend-then-hibernate:Suspend the system for a period of time, and then hibernate it"
"try-reload-or-restart:Reload one or more units if possible, otherwise restart if active"
"isolate:Start one unit and stop all others"
"kill:Send signal to processes of a unit"
diff --git a/src/basic/special.h b/src/basic/special.h
index 81078ffee9..808d8896ae 100644
--- a/src/basic/special.h
+++ b/src/basic/special.h
@@ -37,7 +37,7 @@
#define SPECIAL_SUSPEND_TARGET "suspend.target"
#define SPECIAL_HIBERNATE_TARGET "hibernate.target"
#define SPECIAL_HYBRID_SLEEP_TARGET "hybrid-sleep.target"
-#define SPECIAL_SUSPEND_TO_HIBERNATE_TARGET "suspend-to-hibernate.target"
+#define SPECIAL_SUSPEND_THEN_HIBERNATE_TARGET "suspend-then-hibernate.target"
/* Special boot targets */
#define SPECIAL_RESCUE_TARGET "rescue.target"
diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index 0e8e0b2e4a..da38a2c145 100644
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -48,7 +48,7 @@ int manager_handle_action(
[HANDLE_SUSPEND] = "Suspending...",
[HANDLE_HIBERNATE] = "Hibernating...",
[HANDLE_HYBRID_SLEEP] = "Hibernating and suspending...",
- [HANDLE_SUSPEND_TO_HIBERNATE] = "Suspending to hibernate...",
+ [HANDLE_SUSPEND_THEN_HIBERNATE] = "Suspending, then hibernating...",
};
static const char * const target_table[_HANDLE_ACTION_MAX] = {
@@ -59,7 +59,7 @@ int manager_handle_action(
[HANDLE_SUSPEND] = SPECIAL_SUSPEND_TARGET,
[HANDLE_HIBERNATE] = SPECIAL_HIBERNATE_TARGET,
[HANDLE_HYBRID_SLEEP] = SPECIAL_HYBRID_SLEEP_TARGET,
- [HANDLE_SUSPEND_TO_HIBERNATE] = SPECIAL_SUSPEND_TO_HIBERNATE_TARGET,
+ [HANDLE_SUSPEND_THEN_HIBERNATE] = SPECIAL_SUSPEND_THEN_HIBERNATE_TARGET,
};
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
@@ -112,8 +112,8 @@ int manager_handle_action(
supported = can_sleep("hibernate") > 0;
else if (handle == HANDLE_HYBRID_SLEEP)
supported = can_sleep("hybrid-sleep") > 0;
- else if (handle == HANDLE_SUSPEND_TO_HIBERNATE)
- supported = can_sleep("suspend-to-hibernate") > 0;
+ else if (handle == HANDLE_SUSPEND_THEN_HIBERNATE)
+ supported = can_sleep("suspend-then-hibernate") > 0;
else if (handle == HANDLE_KEXEC)
supported = access(KEXEC, X_OK) >= 0;
else
@@ -131,7 +131,7 @@ int manager_handle_action(
inhibit_operation = IN_SET(handle, HANDLE_SUSPEND, HANDLE_HIBERNATE,
HANDLE_HYBRID_SLEEP,
- HANDLE_SUSPEND_TO_HIBERNATE) ? INHIBIT_SLEEP : INHIBIT_SHUTDOWN;
+ HANDLE_SUSPEND_THEN_HIBERNATE) ? INHIBIT_SLEEP : INHIBIT_SHUTDOWN;
/* If the actual operation is inhibited, warn and fail */
if (!ignore_inhibited &&
@@ -178,7 +178,7 @@ static const char* const handle_action_table[_HANDLE_ACTION_MAX] = {
[HANDLE_SUSPEND] = "suspend",
[HANDLE_HIBERNATE] = "hibernate",
[HANDLE_HYBRID_SLEEP] = "hybrid-sleep",
- [HANDLE_SUSPEND_TO_HIBERNATE] = "suspend-to-hibernate",
+ [HANDLE_SUSPEND_THEN_HIBERNATE] = "suspend-then-hibernate",
[HANDLE_LOCK] = "lock"
};
diff --git a/src/login/logind-action.h b/src/login/logind-action.h
index 1ee8c812ff..9f5dee684c 100644
--- a/src/login/logind-action.h
+++ b/src/login/logind-action.h
@@ -29,7 +29,7 @@ typedef enum HandleAction {
HANDLE_SUSPEND,
HANDLE_HIBERNATE,
HANDLE_HYBRID_SLEEP,
- HANDLE_SUSPEND_TO_HIBERNATE,
+ HANDLE_SUSPEND_THEN_HIBERNATE,
HANDLE_LOCK,
_HANDLE_ACTION_MAX,
_HANDLE_ACTION_INVALID = -1
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 7dc8c5a340..dab4d8aea2 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1927,12 +1927,12 @@ static int method_hybrid_sleep(sd_bus_message *message, void *userdata, sd_bus_e
error);
}
-static int method_suspend_to_hibernate(sd_bus_message *message, void *userdata, sd_bus_error *error) {
+static int method_suspend_then_hibernate(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Manager *m = userdata;
return method_do_shutdown_or_sleep(
m, message,
- SPECIAL_SUSPEND_TO_HIBERNATE_TARGET,
+ SPECIAL_SUSPEND_THEN_HIBERNATE_TARGET,
INHIBIT_SLEEP,
"org.freedesktop.login1.hibernate",
"org.freedesktop.login1.hibernate-multiple-sessions",
@@ -2394,7 +2394,7 @@ static int method_can_hybrid_sleep(sd_bus_message *message, void *userdata, sd_b
error);
}
-static int method_can_suspend_to_hibernate(sd_bus_message *message, void *userdata, sd_bus_error *error) {
+static int method_can_suspend_then_hibernate(sd_bus_message *message, void *userdata, sd_bus_error *error) {
Manager *m = userdata;
return method_can_shutdown_or_sleep(
@@ -2403,7 +2403,7 @@ static int method_can_suspend_to_hibernate(sd_bus_message *message, void *userda
"org.freedesktop.login1.hibernate",
"org.freedesktop.login1.hibernate-multiple-sessions",
"org.freedesktop.login1.hibernate-ignore-inhibit",
- "suspend-to-hibernate",
+ "suspend-then-hibernate",
error);
}
@@ -2727,14 +2727,14 @@ const sd_bus_vtable manager_vtable[] = {
SD_BUS_METHOD("Suspend", "b", NULL, method_suspend, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("Hibernate", "b", NULL, method_hibernate, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("HybridSleep", "b", NULL, method_hybrid_sleep, SD_BUS_VTABLE_UNPRIVILEGED),
- SD_BUS_METHOD("SuspendToHibernate", "b", NULL, method_suspend_to_hibernate, SD_BUS_VTABLE_UNPRIVILEGED),
+ SD_BUS_METHOD("SuspendThenHibernate", "b", NULL, method_suspend_then_hibernate, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("CanPowerOff", NULL, "s", method_can_poweroff, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("CanReboot", NULL, "s", method_can_reboot, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("CanHalt", NULL, "s", method_can_halt, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("CanSuspend", NULL, "s", method_can_suspend, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("CanHibernate", NULL, "s", method_can_hibernate, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("CanHybridSleep", NULL, "s", method_can_hybrid_sleep, SD_BUS_VTABLE_UNPRIVILEGED),
- SD_BUS_METHOD("CanSuspendToHibernate", NULL, "s", method_can_suspend_to_hibernate, SD_BUS_VTABLE_UNPRIVILEGED),
+ SD_BUS_METHOD("CanSuspendThenHibernate", NULL, "s", method_can_suspend_then_hibernate, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("ScheduleShutdown", "st", NULL, method_schedule_shutdown, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("CancelScheduledShutdown", NULL, "b", method_cancel_scheduled_shutdown, SD_BUS_VTABLE_UNPRIVILEGED),
SD_BUS_METHOD("Inhibit", "ssss", "h", method_inhibit, SD_BUS_VTABLE_UNPRIVILEGED),
diff --git a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf
index 970a217df1..f880f3e2da 100644
--- a/src/login/org.freedesktop.login1.conf
+++ b/src/login/org.freedesktop.login1.conf
@@ -152,7 +152,7 @@
+ send_member="SuspendThenHibernate"/>
+ send_member="CanSuspendThenHibernate"/>
= 0)
@@ -7185,7 +7185,7 @@ static void systemctl_help(void) {
" suspend Suspend the system\n"
" hibernate Hibernate the system\n"
" hybrid-sleep Hibernate and suspend the system\n"
- " suspend-to-hibernate Suspend the system, wake after a period of\n"
+ " suspend-then-hibernate Suspend the system, wake after a period of\n"
" time and put it into hibernate\n",
program_invocation_short_name);
}
@@ -8283,7 +8283,7 @@ static int systemctl_main(int argc, char *argv[]) {
{ "suspend", VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
{ "hibernate", VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
{ "hybrid-sleep", VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
- { "suspend-to-hibernate", VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
+ { "suspend-then-hibernate",VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
{ "default", VERB_ANY, 1, VERB_ONLINE_ONLY, start_special },
{ "rescue", VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
{ "emergency", VERB_ANY, 1, VERB_ONLINE_ONLY, start_system_special },
@@ -8615,7 +8615,7 @@ int main(int argc, char*argv[]) {
case ACTION_SUSPEND:
case ACTION_HIBERNATE:
case ACTION_HYBRID_SLEEP:
- case ACTION_SUSPEND_TO_HIBERNATE:
+ case ACTION_SUSPEND_THEN_HIBERNATE:
case ACTION_EMERGENCY:
case ACTION_DEFAULT:
/* systemctl verbs with no equivalent in the legacy commands.
diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c
index e49ecbe494..cea511d8b8 100644
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@ -48,7 +48,7 @@ static void test_sleep(void) {
log_info("Suspend configured and possible: %s", yes_no(can_sleep("suspend") > 0));
log_info("Hibernation configured and possible: %s", yes_no(can_sleep("hibernate") > 0));
log_info("Hybrid-sleep configured and possible: %s", yes_no(can_sleep("hybrid-sleep") > 0));
- log_info("Suspend-to-Hibernate configured and possible: %s", yes_no(can_sleep("suspend-to-hibernate") > 0));
+ log_info("Suspend-then-Hibernate configured and possible: %s", yes_no(can_sleep("suspend-then-hibernate") > 0));
}
int main(int argc, char* argv[]) {
diff --git a/units/meson.build b/units/meson.build
index 7977d07690..344c7d235e 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -36,7 +36,7 @@ units = [
['halt.target', ''],
['hibernate.target', 'ENABLE_HIBERNATE'],
['hybrid-sleep.target', 'ENABLE_HIBERNATE'],
- ['suspend-to-hibernate.target', 'ENABLE_HIBERNATE'],
+ ['suspend-then-hibernate.target', 'ENABLE_HIBERNATE'],
['initrd-fs.target', ''],
['initrd-root-device.target', ''],
['initrd-root-fs.target', ''],
@@ -156,7 +156,7 @@ in_units = [
['systemd-hibernate-resume@.service', 'ENABLE_HIBERNATE'],
['systemd-hibernate.service', 'ENABLE_HIBERNATE'],
['systemd-hybrid-sleep.service', 'ENABLE_HIBERNATE'],
- ['systemd-suspend-to-hibernate.service', 'ENABLE_HIBERNATE'],
+ ['systemd-suspend-then-hibernate.service', 'ENABLE_HIBERNATE'],
['systemd-hostnamed.service', 'ENABLE_HOSTNAMED',
'dbus-org.freedesktop.hostname1.service'],
['systemd-hwdb-update.service', 'ENABLE_HWDB',
diff --git a/units/suspend-to-hibernate.target b/units/suspend-then-hibernate.target
similarity index 83%
rename from units/suspend-to-hibernate.target
rename to units/suspend-then-hibernate.target
index b9ab6d19e1..8c45510095 100644
--- a/units/suspend-to-hibernate.target
+++ b/units/suspend-then-hibernate.target
@@ -11,6 +11,6 @@
Description=Suspend; Idle into hibernate
Documentation=man:systemd.special(7)
DefaultDependencies=no
-Requires=systemd-suspend-to-hibernate.service
-After=systemd-suspend-to-hibernate.service
+Requires=systemd-suspend-then-hibernate.service
+After=systemd-suspend-then-hibernate.service
StopWhenUnneeded=yes
diff --git a/units/systemd-suspend-to-hibernate.service.in b/units/systemd-suspend-then-hibernate.service.in
similarity index 88%
rename from units/systemd-suspend-to-hibernate.service.in
rename to units/systemd-suspend-then-hibernate.service.in
index 9bec9f6269..441ff164a0 100644
--- a/units/systemd-suspend-to-hibernate.service.in
+++ b/units/systemd-suspend-then-hibernate.service.in
@@ -16,4 +16,4 @@ After=sleep.target
[Service]
Type=oneshot
-ExecStart=@rootlibexecdir@/systemd-sleep suspend-to-hibernate
+ExecStart=@rootlibexecdir@/systemd-sleep suspend-then-hibernate