diff options
| author | Deepak Rawat <drawat.floss@gmail.com> | 2021-03-31 09:44:07 -0700 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-03-31 21:43:45 +0200 |
| commit | 1d8a16f1f4827ac8f4a8a46795f311d78536dc44 (patch) | |
| tree | 5fcc3c17c6906ca39ed3424bea3d49ef2baad372 /src/login | |
| parent | 907952bbc92dd6656807d9b2eb0d0c94a4c9e865 (diff) | |
| download | systemd-1d8a16f1f4827ac8f4a8a46795f311d78536dc44.tar.gz | |
logind: Rename kexec reboot flag
Also change error message to be more meanigful. No change in
functionality.
Fixes: 0d96caa5c0
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/logind-dbus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 532be12e7a..526bf21d97 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1880,8 +1880,8 @@ static int method_do_shutdown_or_sleep( return r; if ((flags & ~SD_LOGIND_SHUTDOWN_AND_SLEEP_FLAGS_PUBLIC) != 0) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid flags parameter"); - if (!streq(unit_name, SPECIAL_REBOOT_TARGET) && (flags & SD_LOGIND_KEXEC_REBOOT)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid flags parameter"); + if (!streq(unit_name, SPECIAL_REBOOT_TARGET) && (flags & SD_LOGIND_REBOOT_VIA_KEXEC)) + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Reboot via kexec is only applicable with reboot operations"); } else { /* Old style method: no flags parameter, but interactive bool passed as boolean in * payload. Let's convert this argument to the new-style flags parameter for our internal @@ -1895,7 +1895,7 @@ static int method_do_shutdown_or_sleep( flags = interactive ? SD_LOGIND_INTERACTIVE : 0; } - if ((flags & SD_LOGIND_KEXEC_REBOOT) && kexec_loaded()) + if ((flags & SD_LOGIND_REBOOT_VIA_KEXEC) && kexec_loaded()) unit_name = SPECIAL_KEXEC_TARGET; /* Don't allow multiple jobs being executed at the same time */ |