| Message ID | 20220627142822.3612106-1-ross.lagerwall@citrix.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 375e4dd5be0bf6a8971b238461707ce155c19cd2 |
| Headers | show |
| Series | xen/manage: Use orderly_reboot() to reboot | expand |
On 27.06.22 16:28, Ross Lagerwall wrote: > Currently when the toolstack issues a reboot, it gets translated into a > call to ctrl_alt_del(). But tying reboot to ctrl-alt-del means rebooting > may fail if e.g. the user has masked the ctrl-alt-del.target under > systemd. > > A previous attempt to fix this set the flag to force rebooting when > ctrl_alt_del() is called. Sorry, I have problems parsing this sentence. > However, this doesn't give userspace the > opportunity to block rebooting or even do any cleanup or syncing. > > Instead, call orderly_reboot() which will call the "reboot" command, > giving userspace the opportunity to block it or perform the usual reboot > process while being independent of the ctrl-alt-del behaviour. It also > matches what happens in the shutdown case. > > Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> > --- > drivers/xen/manage.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c > index 3d5a384d65f7..c16df629907e 100644 > --- a/drivers/xen/manage.c > +++ b/drivers/xen/manage.c > @@ -205,7 +205,7 @@ static void do_poweroff(void) > static void do_reboot(void) > { > shutting_down = SHUTDOWN_POWEROFF; /* ? */ > - ctrl_alt_del(); > + orderly_reboot(); > } > > static struct shutdown_handler shutdown_handlers[] = { The code seems to be fine. Albeit I wonder whether we shouldn't turn shutting_down into a bool, as all that seems to be needed is "shutting_down != SHUTDOWN_INVALID" today. But this could be part of another patch. Juergen
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 3d5a384d65f7..c16df629907e 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c @@ -205,7 +205,7 @@ static void do_poweroff(void) static void do_reboot(void) { shutting_down = SHUTDOWN_POWEROFF; /* ? */ - ctrl_alt_del(); + orderly_reboot(); } static struct shutdown_handler shutdown_handlers[] = {
Currently when the toolstack issues a reboot, it gets translated into a call to ctrl_alt_del(). But tying reboot to ctrl-alt-del means rebooting may fail if e.g. the user has masked the ctrl-alt-del.target under systemd. A previous attempt to fix this set the flag to force rebooting when ctrl_alt_del() is called. However, this doesn't give userspace the opportunity to block rebooting or even do any cleanup or syncing. Instead, call orderly_reboot() which will call the "reboot" command, giving userspace the opportunity to block it or perform the usual reboot process while being independent of the ctrl-alt-del behaviour. It also matches what happens in the shutdown case. Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> --- drivers/xen/manage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)