Docker/baseimage-docker
1
0
Fork 1
mirror of https://github.com/phusion/baseimage-docker.git synced 2026-03-28 21:38:41 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
my_init exits with 0 on SIGINT after runit is started
This commit is contained in:
Travis Rowland
2018-01-31 23:09:55 -08:00
committed by GitHub
parent 733dac8706 db73c10615
commit be5d910bad
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
image/bin/my_init
View File

@@ -296,11 +296,8 @@ def start_runit():
def wait_for_runit_or_interrupt(pid): def wait_for_runit_or_interrupt(pid):
try:
status = waitpid_reap_other_children(pid) status = waitpid_reap_other_children(pid)
return (True, status) return (True, status)
except KeyboardInterrupt:
return (False, None)
def shutdown_runit_services(quiet=False): def shutdown_runit_services(quiet=False):