SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logind: Add new flag for kexec reboot

Browse Source 
Add new flag to allow kexec reboot if kernel is already loaded.
This commit is contained in:
Deepak Rawat
2021-03-31 10:48:48 +02:00
committed by Zbigniew Jędrzejewski-Szmek
parent a93af34a40
commit 0d96caa5c0
6 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemctl/systemctl-compat-halt.c
+1 -1
View File
@@ -161,7 +161,7 @@ int halt_main(void) {
/* Try logind if we are a normal user and no special mode applies. Maybe polkit allows us to
* shutdown the machine. */
if (IN_SET(arg_action, ACTION_POWEROFF, ACTION_REBOOT, ACTION_HALT)) {
if (IN_SET(arg_action, ACTION_POWEROFF, ACTION_REBOOT, ACTION_KEXEC, ACTION_HALT)) {
r = logind_reboot(arg_action);
if (r >= 0)
return r;
src/systemctl/systemctl-logind.c
+2
View File
@@ -50,6 +50,7 @@ int logind_reboot(enum action a) {
} actions[_ACTION_MAX] = {
[ACTION_POWEROFF] = { "PowerOff", "power off system" },
[ACTION_REBOOT] = { "Reboot", "reboot system" },
[ACTION_KEXEC] = { "Reboot", "kexec reboot system" },
[ACTION_HALT] = { "Halt", "halt system" },
[ACTION_SUSPEND] = { "Suspend", "suspend system" },
[ACTION_HIBERNATE] = { "Hibernate", "hibernate system" },
@@ -79,6 +80,7 @@ int logind_reboot(enum action a) {
return 0;
SET_FLAG(flags, SD_LOGIND_ROOT_CHECK_INHIBITORS, arg_check_inhibitors > 0);
SET_FLAG(flags, SD_LOGIND_KEXEC_REBOOT, a == ACTION_KEXEC);
method_with_flags = strjoina(actions[a].method, "WithFlags");
src/systemctl/systemctl-start-special.c
+4 -3
View File
@@ -201,6 +201,7 @@ int start_special(int argc, char *argv[], void *userdata) {
if (IN_SET(a,
ACTION_POWEROFF,
ACTION_REBOOT,
ACTION_KEXEC,
ACTION_HALT,
ACTION_SUSPEND,
ACTION_HIBERNATE,
@@ -220,9 +221,9 @@ int start_special(int argc, char *argv[], void *userdata) {
arg_no_block = true;
} else if (IN_SET(a, ACTION_EXIT, ACTION_KEXEC))
/* Since exit/kexec are so close in behaviour to power-off/reboot, let's also make
* them asynchronous, in order to not confuse the user needlessly with unexpected
} else if (IN_SET(a, ACTION_EXIT))
/* Since exit is so close in behaviour to power-off/reboot, let's also make
* it asynchronous, in order to not confuse the user needlessly with unexpected
* behaviour. */
arg_no_block = true;