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 #5383 from Security-Onion-Solutions/feature/soup-y

Browse Source 
Add logic to check unattended flag when checking OS updates
This commit is contained in:
William Wernert
2021-09-02 11:50:45 -04:00
committed by GitHub
parent 6dfc943e8c 56894b9581
commit a14854d56d
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
salt/common/tools/sbin/soup
View File

@@ -289,25 +289,31 @@ check_os_updates() {
OSUPDATES=$(yum -q list updates | wc -l) OSUPDATES=$(yum -q list updates | wc -l)
fi fi
if [[ "$OSUPDATES" -gt 0 ]]; then if [[ "$OSUPDATES" -gt 0 ]]; then
echo $NEEDUPDATES if [[ -z $UNATTENDED ]]; then
echo "" echo "$NEEDUPDATES"
read -p "Press U to update OS packages (recommended), C to continue without updates, or E to exit: " confirm echo ""
read -rp "Press U to update OS packages (recommended), C to continue without updates, or E to exit: " confirm
if [[ "$confirm" == [cC] ]]; then if [[ "$confirm" == [cC] ]]; then
echo "Continuing without updating packages" echo "Continuing without updating packages"
elif [[ "$confirm" == [uU] ]]; then elif [[ "$confirm" == [uU] ]]; then
echo "Applying Grid Updates" echo "Applying Grid Updates"
set +e update_flag=true
run_check_net_err "salt '*' -b 5 state.apply patch.os queue=True" 'Could not apply OS updates, please check your network connection.' else
set -e
else
echo "Exiting soup" echo "Exiting soup"
exit 0 exit 0
fi
else
update_flag=true
fi fi
else else
echo "Looks like you have an updated OS" echo "Looks like you have an updated OS"
fi
if [[ $update_flag == true ]]; then
set +e
run_check_net_err "salt '*' -b 5 state.apply patch.os queue=True" 'Could not apply OS updates, please check your network connection.'
set -e
fi fi
} }
clean_dockers() { clean_dockers() {
@@ -787,7 +793,7 @@ main() {
echo "" echo ""
check_airgap check_airgap
if [[ $is_airgap -eq 0 && $UNATTENDED == true && -z $ISOLOC ]]; then if [[ $is_airgap -eq 0 && $UNATTENDED == true && -z $ISOLOC ]]; then
echo "Missing file argument for unattended airgap upgrade." echo "Missing file argument (-f <FILENAME>) for unattended airgap upgrade."
exit 0 exit 0
fi fi
echo "Checking to see if this is a manager." echo "Checking to see if this is a manager."