pjht/swaylock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't send READY=1 for readiness notifications

Browse Source 
Just send a singular newline like s6 expects.

systemd doesn't support spawning a process with an FD to send
readiness notifications to, instead it provides a socket name. IOW,
this cannot be used directly with systemd after all.

Closes: https://github.com/swaywm/swaylock/issues/312
This commit is contained in:
Simon Ser 2023-10-05 17:11:03 +02:00 committed by Kenny Levinsen
parent 10df946671
commit f692ee0075
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main.c
View File

@ -1251,10 +1251,7 @@ int main(int argc, char **argv) {
}
if (state.args.ready_fd >= 0) {
// s6 wants a newline and ignores any text before that, systemd wants
// READY=1, so use the least common denominator
const char ready_str[] = "READY=1\n";
if (write(state.args.ready_fd, ready_str, strlen(ready_str)) != strlen(ready_str)) {
if (write(state.args.ready_fd, "\n", 1) != 1) {
swaylock_log(LOG_ERROR, "Failed to send readiness notification");
return 2;
}