shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-09-14 09:44:48 +03:00
Code Activity

logind: fix merge issue

Browse Source 
The two PRs #16664 and #16635 individually passed CI, but when combined
cannot build. Since both are merged now, let's fix that.
This commit is contained in:
Lennart Poettering
2020-09-09 19:17:31 +02:00
parent adbb2b6afe
commit 197db625a3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/login/logind-inhibit.c
View File

@@ -522,7 +522,7 @@ int inhibit_what_from_string(const char *s) {
what |= INHIBIT_HANDLE_HIBERNATE_KEY; what |= INHIBIT_HANDLE_HIBERNATE_KEY;
else if (streq(word, "handle-lid-switch")) else if (streq(word, "handle-lid-switch"))
what |= INHIBIT_HANDLE_LID_SWITCH; what |= INHIBIT_HANDLE_LID_SWITCH;
else if (l == 17 && strneq(word, "handle-reboot-key", l)) else if (streq(word, "handle-reboot-key"))
what |= INHIBIT_HANDLE_REBOOT_KEY; what |= INHIBIT_HANDLE_REBOOT_KEY;
else else
return _INHIBIT_WHAT_INVALID; return _INHIBIT_WHAT_INVALID;