system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-15 04:24:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemctl: set reboot argument for most forms of shutdown, not just plain reboots

Browse source 
This doesn't hurt anyway, and is useful now that we propagate the string
via sd_notify() too.
This commit is contained in:
Lennart Poettering 2024-04-23 10:14:41 +02:00
parent 8c081ae84b
commit c65bd6cc7e
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/systemctl/systemctl-start-special.c
View file

@ -155,14 +155,16 @@ int verb_start_special(int argc, char *argv[], void *userdata) {
return r;
}
if (a == ACTION_REBOOT) {
if (arg_reboot_argument) {
r = update_reboot_parameter_and_warn(arg_reboot_argument, false);
if (r < 0)
return r;
}
if (arg_reboot_argument && IN_SET(a, ACTION_HALT, ACTION_POWEROFF, ACTION_REBOOT, ACTION_KEXEC)) {
/* If we are going through an action that involves systemd-shutdown, let's set the reboot
* parameter, even if it's not a regular reboot. After all we nowadays send the string to
* our supervisor via sd_notify() too. */
r = update_reboot_parameter_and_warn(arg_reboot_argument, /* keep= */ false);
if (r < 0)
return r;
}
} else if (a == ACTION_KEXEC) {
if (a == ACTION_KEXEC) {
r = load_kexec_kernel();
if (r < 0 && arg_force >= 1)
log_notice("Failed to load kexec kernel, continuing without.");