From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 18 May 2010 01:27:02 +0000 (+0200)
Subject: main: if we fail to acquire a terminal for the crash shell, warn but continue
X-Git-Tag: v1~328
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=5b2a09037232980ad42ba3611cf194078ae5e546

main: if we fail to acquire a terminal for the crash shell, warn but continue
---

diff --git a/src/main.c b/src/main.c
index bba2975e4..e2d2ab5e6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -138,15 +138,10 @@ _noreturn static void crash(int sig) {
                 else if (pid == 0) {
                         int fd, r;
 
-                        if ((fd = acquire_terminal("/dev/console", false, true)) < 0) {
+                        if ((fd = acquire_terminal("/dev/console", false, true)) < 0)
                                 log_error("Failed to acquire terminal: %s", strerror(-fd));
-                                _exit(1);
-                        }
-
-                        if ((r = make_stdio(fd)) < 0) {
+                        else if ((r = make_stdio(fd)) < 0)
                                 log_error("Failed to duplicate terminal fd: %s", strerror(-r));
-                                _exit(1);
-                        }
 
                         execl("/bin/sh", "/bin/sh", NULL);