From 0c2ea53f259759c9b536e2a926ca298459d8b5f2 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Fri, 7 Aug 2020 16:42:46 -0400 Subject: [PATCH] revert back to local_salt_dir --- setup/so-functions | 2 +- setup/so-setup | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/setup/so-functions b/setup/so-functions index 26871658c..800d57a90 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -962,7 +962,7 @@ manager_pillar() { } manager_global() { - local global_pillar="$temp_install_dir/pillar/global.sls" + local global_pillar="$local_salt_dir/pillar/global.sls" if [ -z "$SENSOR_CHECKIN_INTERVAL_MS" ]; then SENSOR_CHECKIN_INTERVAL_MS=10000 diff --git a/setup/so-setup b/setup/so-setup index 9c0255cea..cae5d1029 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -247,6 +247,7 @@ fi if [[ $is_importpcap ]]; then patch_schedule=Automatic + MTU=1500 RULESETUP=ETOPEN NSMSETUP=BASIC HNSENSOR=inherit