morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

shutdown: don't freeze() if not executed by pid1

Browse Source
This commit is contained in:
Mike Yuan
2024-05-15 23:02:02 +08:00
parent 2e4da5e08c
commit a2d4451e64
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/shutdown/shutdown.c
View File

@@ -377,8 +377,12 @@ int main(int argc, char *argv[]) {
log_set_prohibit_ipc(true);
log_parse_environment();
if (getpid_cached() == 1)
log_set_always_reopen_console(true);
if (getpid_cached() != 1) {
log_error("Not executed by init (PID 1). Refusing to operate.");
return EXIT_FAILURE;
}
log_set_always_reopen_console(true);
r = parse_argv(argc, argv);
if (r < 0)
@@ -388,11 +392,6 @@ int main(int argc, char *argv[]) {
umask(0022);
if (getpid_cached() != 1) {
r = log_error_errno(SYNTHETIC_ERRNO(EPERM), "Not executed by init (PID 1).");
goto error;
}
if (streq(arg_verb, "reboot"))
cmd = RB_AUTOBOOT;
else if (streq(arg_verb, "poweroff"))
@@ -667,7 +666,7 @@ int main(int argc, char *argv[]) {
r = log_error_errno(errno, "Failed to invoke reboot(): %m");
error:
error:
log_struct_errno(LOG_EMERG, r,
LOG_MESSAGE("Critical error while doing system shutdown: %m"),
"MESSAGE_ID=" SD_MESSAGE_SHUTDOWN_ERROR_STR);