SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8606 from dell/rename-suspend-to-hibernate

Browse Source 
Rename suspend-to-hibernate to suspend-then-hibernate
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2018-03-29 12:30:18 +02:00
committed by GitHub
parent 984b9c8cfe ca037d1e08
commit 3d5b4aaad3
19 changed files with 73 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/sleep-config.c
+4 -4
View File
@@ -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);