From: Davin McCall <davmac@davmac.org>
Date: Thu, 8 Jun 2017 17:32:20 +0000 (+0100)
Subject: Wait for user acknowledgement before rebooting on boot failure.
X-Git-Tag: v0.06~89
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9fc5cb7d7113147f4ae135ed1cf973af0fea33bd;p=oweals%2Fdinit.git

Wait for user acknowledgement before rebooting on boot failure.

If we can't load the boot service, rebooting immediately will likely
lead to a boot loop. Instead, prompt the user to acknowledge issue.
---

diff --git a/src/dinit.cc b/src/dinit.cc
index 8a0b732..d9f08ee 100644
--- a/src/dinit.cc
+++ b/src/dinit.cc
@@ -46,6 +46,7 @@ static void sigint_reboot_cb(EventLoop_t &eloop) noexcept;
 static void sigquit_cb(EventLoop_t &eloop) noexcept;
 static void sigterm_cb(EventLoop_t &eloop) noexcept;
 static void close_control_socket() noexcept;
+static void wait_for_user_input() noexcept;
 
 static void control_socket_cb(EventLoop_t *loop, int fd);
 
@@ -377,8 +378,9 @@ static int dinit_main(int argc, char **argv)
                 goto event_loop; // yes, the "evil" goto
             }
             catch (...) {
-                // Now WTF do we do? try to reboot
-                log(LogLevel::ERROR, "Could not start 'boot' service; rebooting.");
+                // Now what do we do? try to reboot, but wait for user ack to avoid boot loop.
+                log(LogLevel::ERROR, "Could not start 'boot' service. Will attempt reboot.");
+                wait_for_user_input();
                 shutdown_type = ShutdownType::REBOOT;
             }
         }
@@ -427,6 +429,15 @@ int main(int argc, char **argv)
     }
 }
 
+// In exception situations we want user confirmation before proceeding (eg on critical boot failure
+// we wait before rebooting to avoid a reboot loop).
+static void wait_for_user_input() noexcept
+{
+    std::cout << "Press Enter to continue." << std::endl;
+    char buf[1];
+    read(STDIN_FILENO, buf, 1);
+}
+
 // Callback for control socket
 static void control_socket_cb(EventLoop_t *loop, int sockfd)
 {