#840: Suppress waiting on info messages from wrapper script when boot…

…strap has completed.
jdeathe · Sep 19, 2019 · 1aa0966 · 1aa0966
1 parent 1ee846e
commit 1aa0966
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ Summary of release changes.
 - Updates method used for returning current script.
 - Updates info/error output for consistency.
 - Updates healthcheck failure messages to remove EOL character that is rendered in status response.
+- Updates wrapper script; only emit "waiting on" info message if bootstrap hasn't completed.
 - Adds improved test workflow; added `test-setup` target to Makefile.
 - Adds Makefile target `logsdef` to handle deferred logs output within a target chain.
 - Adds exec proxy function to `sshd-wrapper` used to pass through nice.

diff --git a/src/usr/sbin/sshd-wrapper b/src/usr/sbin/sshd-wrapper
@@ -83,7 +83,8 @@ function main ()
 		__get_proxy
 	)"
 
-	if [[ ${verbose} == true ]]
+	if [[ ${verbose} == true ]] \
+		&& [[ ! -f ${bootstrap_state_file} ]]
 	then
 		printf -- \
 			'INFO: %s waiting on %s\n' \