Fix permissions on test scripts

Changelog.md

@@ -1,3 +1,8 @@
+## 0.9.8 (release date: 2014-02-26)
+
+ * Fixed a regression in `my_init` which causes it to delete environment variables passed from Docker.
+ * Fixed `my_init` not properly forcing Runit to shut down if Runit appears to refuse to respond to SIGTERM.
+
 ## 0.9.7 (release date: 2014-02-25)
 
  * Improved and fixed bugs in `my_init` (Thomas LÉVEIL):

Makefile

@@ -1,5 +1,5 @@
 NAME = phusion/baseimage
-VERSION = 0.9.7
+VERSION = 0.9.8
 
 .PHONY: all build test tag_latest release ssh
 

image/my_init

@@ -54,14 +54,15 @@ def is_exe(path):
 	except OSError:
 		return False
 
-def import_envvars():
+def import_envvars(clear_existing_environment = True):
 	new_env = {}
 	for envfile in listdir("/etc/container_environment"):
 		name = os.path.basename(envfile)
 		with open("/etc/container_environment/" + envfile, "r") as f:
 			value = f.read()
 		new_env[name] = value
-	os.environ.clear()
+	if clear_existing_environment:
+		os.environ.clear()
 	for name, value in new_env.items():
 		os.environ[name] = value
 
@@ -93,6 +94,13 @@ def shquote(s):
 def waitpid_reap_other_children(pid):
 	done = False
 	status = None
+	try:
+		this_pid, status = os.waitpid(pid, os.WNOHANG)
+	except OSError as e:
+		if e.errno == errno.ECHILD or e.errno == errno.ESRCH:
+			return None
+		else:
+			raise
 	while not done:
 		this_pid, status = os.waitpid(-1, 0)
 		done = this_pid == pid
@@ -134,7 +142,10 @@ def run_command_killable(*argv):
 		stop_child_process(filename, pid)
 		raise
 	if status != 0:
-		error("%s failed with exit code %d\n" % (filename, status))
+		if status is None:
+			error("%s exited with unknown exit code\n" % filename)
+		else:
+			error("%s failed with exit code %d\n" % (filename, status))
 		sys.exit(1)
 
 def run_command_killable_and_import_envvars(*argv):
@@ -213,7 +224,7 @@ def install_insecure_key():
 	run_command_killable("/usr/sbin/enable_insecure_key")
 
 def main(args):
-	import_envvars()
+	import_envvars(False)
 	export_envvars()
 
 	if args.enable_insecure_key:
@@ -231,13 +242,21 @@ def main(args):
 		if len(args.main_command) == 0:
 			runit_exited, exit_code = wait_for_runit_or_interrupt(runit_pid)
 			if runit_exited:
-				info("Runit exited with code %d" % exit_code)
+				if exit_code is None:
+					info("Runit exited with unknown exit code")
+					exit_code = 1
+				else:
+					info("Runit exited with code %d" % exit_code)
 		else:
 			info("Running %s..." % " ".join(args.main_command))
 			pid = os.spawnvp(os.P_NOWAIT, args.main_command[0], args.main_command)
 			try:
 				exit_code = waitpid_reap_other_children(pid)
-				info("%s exited with exit code %d." % (args.main_command[0], exit_code))
+				if exit_code is None:
+					info("%s exited with unknown exit code." % args.main_command[0])
+					exit_code = 1
+				else:
+					info("%s exited with exit code %d." % (args.main_command[0], exit_code))
 			except KeyboardInterrupt:
 				stop_child_process(args.main_command[0], pid)
 			except BaseException as s: