summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorMario Limonciello <mario.limonciello@dell.com>2018-03-28 11:00:06 -0500
committerMario Limonciello <mario.limonciello@dell.com>2018-03-28 15:11:10 -0500
commite68c79db912f8ea7ae6614113d15c81aa8866601 (patch)
tree97db92d5b8a071575af152cc4b0407dade5430c5 /src/shared
parent9d9dd746d461e4524fb3644b20b8138448d666f2 (diff)
downloadsystemd-e68c79db912f8ea7ae6614113d15c81aa8866601.tar.gz
Rename suspend-to-hibernate to suspend-then-hibernate
Per some discussion with Gnome folks, they would prefer this name as it's more descriptive of what's happening.
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/sleep-config.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
index f65eed87f2..49531addd5 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-config.c
@@ -96,13 +96,13 @@ int parse_sleep_config(const char *verb, char ***_modes, char ***_states, usec_t
else
states = strv_new("disk", NULL);
- } else if (streq(verb, "suspend-to-hibernate"))
+ } else if (streq(verb, "suspend-then-hibernate"))
modes = states = NULL;
else
assert_not_reached("what verb");
if ((!modes && STR_IN_SET(verb, "hibernate", "hybrid-sleep")) ||
- (!states && !streq(verb, "suspend-to-hibernate"))) {
+ (!states && !streq(verb, "suspend-then-hibernate"))) {
strv_free(modes);
strv_free(states);
return log_oom();
@@ -298,9 +298,9 @@ int can_sleep(const char *verb) {
_cleanup_strv_free_ char **modes = NULL, **states = NULL;
int r;
- assert(STR_IN_SET(verb, "suspend", "hibernate", "hybrid-sleep", "suspend-to-hibernate"));
+ assert(STR_IN_SET(verb, "suspend", "hibernate", "hybrid-sleep", "suspend-then-hibernate"));
- if (streq(verb, "suspend-to-hibernate"))
+ if (streq(verb, "suspend-then-hibernate"))
return can_s2h();
r = parse_sleep_config(verb, &modes, &states, NULL);