1
0
mirror of /repos/baseimage-docker.git synced 2026-02-26 17:32:03 +01:00

Fix my_init not properly exiting with a non-zero exit status when Ctrl-C is pressed.

This commit is contained in:
Hongli Lai (Phusion)
2014-07-25 14:37:03 +02:00
parent a0d4877272
commit 9be2ee2916
2 changed files with 5 additions and 0 deletions

View File

@@ -291,6 +291,7 @@ def main(args):
info("%s exited with status %d." % (args.main_command[0], exit_status))
except KeyboardInterrupt:
stop_child_process(args.main_command[0], pid)
raise
except BaseException as s:
warn("An error occurred. Aborting.")
stop_child_process(args.main_command[0], pid)