CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1341 from Security-Onion-Solutions/issue/1066

Browse Source 
change how we determine how to run so-status
This commit is contained in:
Josh Patterson
2020-09-14 12:43:05 -04:00
committed by GitHub
parent f86780a0db b559e5dd32
commit 32632864eb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
salt/common/tools/sbin/so-status
View File

@@ -27,6 +27,7 @@ ERROR_STRING="ERROR"
SUCCESS_STRING="OK" SUCCESS_STRING="OK"
PENDING_STRING="PENDING" PENDING_STRING="PENDING"
MISSING_STRING='MISSING' MISSING_STRING='MISSING'
CALLER=$(ps -o comm= $PPID)
declare -a BAD_STATUSES=("removing" "paused" "exited" "dead") declare -a BAD_STATUSES=("removing" "paused" "exited" "dead")
declare -a PENDING_STATUSES=("paused" "created" "restarting") declare -a PENDING_STATUSES=("paused" "created" "restarting")
declare -a GOOD_STATUSES=("running") declare -a GOOD_STATUSES=("running")
@@ -167,7 +168,7 @@ non_term_print_line() {
main() { main() {
# if running from salt # if running from salt
if [ "$TERM" == 'dumb' ]; then if [ "$CALLER" == 'salt-call' ] || [ "$CALLER" == 'salt-minion' ]; then
printf "\n" printf "\n"
printf "Checking Docker status\n\n" printf "Checking Docker status\n\n"