Set standalone to load Xwindows

This commit is contained in:
Mike Reeves
2022-03-29 17:31:53 -04:00
parent 45161b2a39
commit c4a4e9737b
2 changed files with 9 additions and 11 deletions

View File

@@ -2060,16 +2060,6 @@ print_salt_state_apply() {
echo "Applying $state Salt state" echo "Applying $state Salt state"
} }
progress() {
local msg=${1:-'Please wait while installing...'}
if [ $automated == no ]; then
whiptail --title "$whiptail_title" --gauge "$msg" 6 70 0 # append to text
else
cat >> $setup_log 2>&1
fi
}
proxy_validate() { proxy_validate() {
echo "Testing proxy..." echo "Testing proxy..."
local test_url="https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/master/KEYS" local test_url="https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/master/KEYS"

View File

@@ -142,7 +142,15 @@ catch() {
exit 1 exit 1
} }
automated=no automated=no
progress progress() {
local msg=${1:-'Please wait while installing...'}
if [ $automated == no ]; then
whiptail --title "$whiptail_title" --gauge "$msg" 6 70 0 # append to text
else
cat >> $setup_log 2>&1
fi
}
if [[ -f automation/$automation && $(basename $automation) == $automation ]]; then if [[ -f automation/$automation && $(basename $automation) == $automation ]]; then
echo "Preselecting variable values based on automated setup: $automation" >> $setup_log 2>&1 echo "Preselecting variable values based on automated setup: $automation" >> $setup_log 2>&1