From de22e52d43490840f83ecf0c05e29c2f84d029f9 Mon Sep 17 00:00:00 2001 From: dougbtv Date: Tue, 9 Feb 2021 15:14:06 -0500 Subject: [PATCH] Change to sleep infinity & read and omit & wait on sleep n (e.g. not infinity) --- images/entrypoint.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/images/entrypoint.sh b/images/entrypoint.sh index 9997b7d20..29d3c69f1 100755 --- a/images/entrypoint.sh +++ b/images/entrypoint.sh @@ -253,7 +253,7 @@ if [ "$MULTUS_CONF_FILE" == "auto" ]; then log "Attemping to find master plugin configuration, attempt $tries" fi let "tries+=1" - sleep 1 & wait; + sleep 1; else error "Multus could not be configured: no master plugin was found." exit 1; @@ -397,22 +397,22 @@ if [ "$MULTUS_CLEANUP_CONFIG_ON_EXIT" == true ]; then # Check and see if the original master plugin configuration exists... if [ ! -f "$MASTER_PLUGIN_LOCATION" ]; then log "Master plugin @ $MASTER_PLUGIN_LOCATION has been deleted. Allowing 45 seconds for its restoration..." - sleep 10 & wait + sleep 10 for i in {1..35} do if [ -f "$MASTER_PLUGIN_LOCATION" ]; then log "Master plugin @ $MASTER_PLUGIN_LOCATION was restored. Regenerating given configuration." break fi - sleep 1 & wait + sleep 1 done generateMultusConf log "Continuing watch loop after configuration regeneration..." fi - sleep 1 & wait + sleep 1 done else log "Entering sleep (success)..." - sleep infinity & wait + sleep infinity & read fi