From 9416a24f03be098f034ac8ee58672c01620309bb Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 29 Apr 2009 13:53:02 +0200
Subject: [PATCH] Don't finalise from signal handler

---
 main.c  | 3 ++-
 sched.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index bd40652..42f44f7 100644
--- a/main.c
+++ b/main.c
@@ -123,7 +123,8 @@ static void
 signal_cleanup(int x)
 {
   LOG(LOGS_WARN, LOGF_Main, "chronyd exiting on signal");
-  MAI_CleanupAndExit();
+  if (!initialised) exit(0);
+  SCH_QuitProgram();
 }
 
 /* ================================================== */
diff --git a/sched.c b/sched.c
index 3b0c711..5650517 100644
--- a/sched.c
+++ b/sched.c
@@ -558,7 +558,8 @@ SCH_MainLoop(void)
     status = select(one_highest_fd, &rd, &wr, &ex, ptv);
 
     if (status < 0) {
-      CROAK("Status < 0 after select");
+      if (!need_to_exit)
+        CROAK("Status < 0 after select");
     } else if (status > 0) {
       /* A file descriptor is ready to read */