From dffb92b5520a4b539f0466d4161fcaacc6ba5ba8 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 19 Apr 2022 11:34:27 +0800
Subject: [PATCH] main: don't freeze PID 1 in containers, exit with

---
 src/core/main.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/core/main.c b/src/core/main.c
index d897155..0aec5d1 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -139,7 +139,13 @@ static NUMAPolicy arg_numa_policy;
 static int parse_configuration(const struct rlimit *saved_rlimit_nofile,
                                const struct rlimit *saved_rlimit_memlock);
 
-_noreturn_ static void freeze_or_reboot(void) {
+_noreturn_ static void freeze_or_exit_or_reboot(void) {
+	/* If we are running in a contianer, let's prefer exiting, after all we can propagate an exit code to the
+	 * container manager, and thus inform it that something went wrong. */
+	if (detect_container() > 0) {
+		log_emergency("Exiting PID 1...");
+		exit(EXIT_EXCEPTION);
+	}
 
         if (arg_crash_reboot) {
                 log_notice("Rebooting in 10s...");
@@ -247,7 +253,7 @@ _noreturn_ static void crash(int sig) {
                 }
         }
 
-        freeze_or_reboot();
+	freeze_or_exit_or_reboot();
 }
 
 static void install_crash_handler(void) {
@@ -2664,9 +2670,9 @@ finish:
                 if (error_message)
                         manager_status_printf(NULL, STATUS_TYPE_EMERGENCY,
                                               ANSI_HIGHLIGHT_RED "!!!!!!" ANSI_NORMAL,
-                                              "%s, freezing.", error_message);
-                freeze_or_reboot();
+		                              "%s.", error_message);
+		freeze_or_exit_or_reboot();
         }
 
         reset_arguments();
         return retval;
-- 
2.27.0