From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 5 Jun 2024 15:57:07 +0000 (+0200)
Subject: shutdown: re-enable CAD handling in kernel at start
X-Git-Tag: v257-rc1~1130^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F33355%2Fhead;p=thirdparty%2Fsystemd.git

shutdown: re-enable CAD handling in kernel at start
---

diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
index 8e11e3533a3..03e6e70fd85 100644
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
@@ -374,6 +374,11 @@ int main(int argc, char *argv[]) {
 
         log_set_always_reopen_console(true);
 
+        /* Re-enable reboot on Ctrl-Alt-Delete, so that if close/broadcast_signal/umount/... stalls,
+         * or an error is encountered and we freeze(), the user can still initiate a force reboot
+         * through kernel. */
+        (void) reboot(RB_ENABLE_CAD);
+
         r = parse_argv(argc, argv);
         if (r < 0)
                 goto error;