#695: Fixes __reap call and missed variable rename.

jdeathe · Jun 12, 2019 · 6ef33d5 · 6ef33d5
1 parent 0bd1b43
commit 6ef33d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/default.mk b/default.mk
@@ -41,9 +41,9 @@ DOCKER_PUBLISH := $(shell \
 define DOCKER_CONTAINER_PARAMETERS
 --name $(DOCKER_NAME) \
 --restart $(DOCKER_RESTART_POLICY) \
+--env "ENABLE_REAPER=$(ENABLE_REAPER)" \
 --env "REAPER_TIMEOUT=$(REAPER_TIMEOUT)" \
 --env "SSH_AUTHORIZED_KEYS=$(SSH_AUTHORIZED_KEYS)" \
---env "SSH_AUTOSTART_REAPER=$(SSH_AUTOSTART_REAPER)" \
 --env "SSH_AUTOSTART_SSHD=$(SSH_AUTOSTART_SSHD)" \
 --env "SSH_AUTOSTART_SSHD_BOOTSTRAP=$(SSH_AUTOSTART_SSHD_BOOTSTRAP)" \
 --env "SSH_AUTOSTART_SUPERVISOR_STDOUT=$(SSH_AUTOSTART_SUPERVISOR_STDOUT)" \

diff --git a/src/usr/sbin/reaper b/src/usr/sbin/reaper
@@ -48,7 +48,7 @@ function __is_valid_reaper_timeout ()
 
 function __reap ()
 {
-	return kill \
+	kill \
 		-s "${signal:-TERM}" \
 		"${pid:-1}"
 }