40n8.me/baseimage-docker
1
0
Fork 0
mirror of /repos/baseimage-docker.git synced 2025-12-31 08:11:29 +01:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Hongli Lai (Phusion) 2014-07-25 14:37:03 +02:00
parent a0d4877272
commit 9be2ee2916
No known key found for this signature in database
GPG Key ID: 2AF96EB85EF4DA0D
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog.md
View File

@ -1,3 +1,7 @@
## 0.9.13 (not yet released)
* Fixed `my_init` not properly exiting with a non-zero exit status when Ctrl-C is pressed.
## 0.9.12 (release date: 2014-07-24) ## 0.9.12 (release date: 2014-07-24)
* We now officially support `nsenter` as an alternative way to login to the container. With official support, we mean that we've provided extensive documentation on how to use `nsenter`, as well as related convenience tools. However, because `nsenter` has various issues, and for backward compatibility reasons, we still support SSH. Please refer to the README for details about `nsenter`, and what the pros and cons are compared to SSH. * We now officially support `nsenter` as an alternative way to login to the container. With official support, we mean that we've provided extensive documentation on how to use `nsenter`, as well as related convenience tools. However, because `nsenter` has various issues, and for backward compatibility reasons, we still support SSH. Please refer to the README for details about `nsenter`, and what the pros and cons are compared to SSH.

1
image/bin/my_init
View File

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