Merge pull request #445 from phusion/Theaxiom-patch-1

my_init exits with 0 on SIGINT after runit is started
2018-01-31 23:09:55 -08:00
parent 733dac8706 db73c10615
commit be5d910bad
1 changed files with 2 additions and 5 deletions
--- a/image/bin/my_init
+++ b/image/bin/my_init
@@ -296,11 +296,8 @@ def start_runit():


 def wait_for_runit_or_interrupt(pid):
-    try:
-        status = waitpid_reap_other_children(pid)
-        return (True, status)
-    except KeyboardInterrupt:
-        return (False, None)
+	status = waitpid_reap_other_children(pid)
+	return (True, status)


 def shutdown_runit_services(quiet=False):