saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-16 09:40:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Fix for Amazon Linux Images"

Browse source 
This reverts commit c381b0d82c6c6ea7bce7d1d4dc63ce90c4323d02.
This commit is contained in:
Nick Henry 2019-04-16 19:56:21 -06:00
parent 45cb333949
commit adad3ca885
No known key found for this signature in database
GPG key ID: F07323A316D1BBD4
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstrap-salt.sh
View file

@ -529,7 +529,7 @@ __exit_cleanup() {
# Kill tee when exiting, CentOS, at least requires this
# shellcheck disable=SC2009
TEE_PID=$(/usr/bin/ps ax | grep tee | grep "$LOGFILE" | awk '{print $1}')
TEE_PID=$(ps ax | grep tee | grep "$LOGFILE" | awk '{print $1}')
[ "$TEE_PID" = "" ] && exit $EXIT_CODE
@ -555,7 +555,7 @@ trap "__exit_cleanup" EXIT INT
# Let's discover how we're being called
# shellcheck disable=SC2009
CALLER=$(/usr/bin/ps -a -o pid,args | grep $$ | grep -v grep | tr -s ' ' | cut -d ' ' -f 3)
CALLER=$(ps -a -o pid,args | grep $$ | grep -v grep | tr -s ' ' | cut -d ' ' -f 3)
if [ "${CALLER}x" = "${0}x" ]; then
CALLER="shell pipe"
@ -4541,7 +4541,7 @@ daemons_running_alpine_linux() {
[ $fname = "syndic" ] && [ "$_INSTALL_SYNDIC" -eq $BS_FALSE ] && continue
# shellcheck disable=SC2009
if [ "$(/usr/bin/ps wwwaux | grep -v grep | grep salt-$fname)" = "" ]; then
if [ "$(ps wwwaux | grep -v grep | grep salt-$fname)" = "" ]; then
echoerror "salt-$fname was not found running"
FAILED_DAEMONS=$((FAILED_DAEMONS + 1))
fi
@ -6811,7 +6811,7 @@ daemons_running() {
echoerror "salt-$fname was not found running"
FAILED_DAEMONS=$((FAILED_DAEMONS + 1))
fi
elif [ "$(/usr/bin/ps wwwaux | grep -v grep | grep salt-$fname)" = "" ]; then
elif [ "$(ps wwwaux | grep -v grep | grep salt-$fname)" = "" ]; then
echoerror "salt-$fname was not found running"
FAILED_DAEMONS=$((FAILED_DAEMONS + 1))
fi
@ -7122,7 +7122,7 @@ if [ "$DAEMONS_RUNNING_FUNC" != "null" ] && [ ${_START_DAEMONS} -eq $BS_TRUE ];
done
echodebug "Running Processes:"
echodebug "$(/usr/bin/ps auxwww)"
echodebug "$(ps auxwww)"
exit 1
fi