shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

shutdown: In sync_with_progress(), log first then send SIGKILL

Browse Source 
The order of these 2 lines was swapped in commit
758760a361. Put them in the right order,
and take yuwata's comment into account.
This commit is contained in:
Benjamin ROBIN 2024-10-06 17:02:06 +02:00 committed by Mike Yuan
parent ac36c4dcd9
commit 615279f369
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/shutdown/shutdown.c
View File

@ -268,11 +268,10 @@ int sync_with_progress(int fd) {
}
/* Only reached in the event of a timeout. We should issue a kill to the stray process. */
r = log_error_errno(SYNTHETIC_ERRNO(ETIMEDOUT),
"Syncing %s - timed out, issuing SIGKILL to PID "PID_FMT".", what, pid);
(void) kill(pid, SIGKILL);
return log_error_errno(SYNTHETIC_ERRNO(ETIMEDOUT),
"Syncing %s - timed out, issuing SIGKILL to PID "PID_FMT".",
what,
pid);
return r;
}
static int read_current_sysctl_printk_log_level(void) {