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

[fix] Padding 3->4 spaces, don't use lookup_pillar before salt is installed

Browse Source
This commit is contained in:
William Wernert
2021-01-15 08:57:05 -05:00
parent 07b5f1d23e
commit f4de5e28bf
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/so-functions
View File

@@ -861,9 +861,6 @@ configure_network_sensor() {
local nmcli_con_args=( "type" "bond" "mode" "0" ) local nmcli_con_args=( "type" "bond" "mode" "0" )
fi fi
local MTU
MTU=$(lookup_pillar "mtu" "sensor")
# Create the bond interface only if it doesn't already exist # Create the bond interface only if it doesn't already exist
nmcli -f name,uuid -p con | grep -q "$INTERFACE" >> "$setup_log" 2>&1 nmcli -f name,uuid -p con | grep -q "$INTERFACE" >> "$setup_log" 2>&1
local found_int=$? local found_int=$?
@@ -2250,6 +2247,7 @@ sensor_pillar() {
if [[ $NSMSETUP != 'ADVANCED' ]]; then if [[ $NSMSETUP != 'ADVANCED' ]]; then
if [[ $is_cloud ]]; then MTU=1575; else MTU=1500; fi if [[ $is_cloud ]]; then MTU=1575; else MTU=1500; fi
fi fi
export MTU
# Create the sensor pillar # Create the sensor pillar
printf '%s\n'\ printf '%s\n'\

4
setup/so-whiptail
View File

@@ -646,8 +646,8 @@ whiptail_first_menu_iso() {
[ -n "$TESTING" ] && return [ -n "$TESTING" ] && return
option=$(whiptail --title "Security Onion Setup" --menu "Select an option" 10 75 2 \ option=$(whiptail --title "Security Onion Setup" --menu "Select an option" 10 75 2 \
"Install " "Run the standard Security Onion installation " \ "Install " "Run the standard Security Onion installation " \
"Configure Network " "Configure networking only " \ "Configure Network " "Configure networking only " \
3>&1 1>&2 2>&3 3>&1 1>&2 2>&3
) )
local exitstatus=$? local exitstatus=$?