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

[fix][wip] Don't use variable for accept_changes file

Browse Source
This commit is contained in:
William Wernert
2020-11-18 12:54:29 -05:00
parent 57e9f69c97
commit 34fd80182e
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/so-setup
View File

@@ -55,7 +55,7 @@ while [[ $# -gt 0 ]]; do
done done
is_reinstall=false is_reinstall=false
if [[ -f $change_file ]]; then if [[ -f /root/accept_changes ]]; then
is_reinstall=true is_reinstall=true
# Move last setup log to backup # Move last setup log to backup
@@ -425,9 +425,9 @@ fi
if [[ $is_manager || $is_import ]]; then whiptail_so_allow; fi if [[ $is_manager || $is_import ]]; then whiptail_so_allow; fi
whiptail_make_changes whiptail_make_changes
touch $change_file
# From here on changes will be made. # From here on changes will be made.
echo "1" > /root/accept_changes
if [[ $is_reinstall ]]; then if [[ $is_reinstall ]]; then
reinstall_init reinstall_init

3
setup/so-variables
View File

@@ -21,9 +21,6 @@ export node_es_port
setup_log="/root/sosetup.log" setup_log="/root/sosetup.log"
export setup_log export setup_log
change_file="/root/accept_changes"
export change_file
filesystem_root=$(df / | awk '$3 ~ /[0-9]+/ { print $2 * 1000 }') filesystem_root=$(df / | awk '$3 ~ /[0-9]+/ { print $2 * 1000 }')
export filesystem_root export filesystem_root