From 34fd80182e3fa2124dcd235dac0bde637e7ccf9a Mon Sep 17 00:00:00 2001 From: William Wernert Date: Wed, 18 Nov 2020 12:54:29 -0500 Subject: [PATCH] [fix][wip] Don't use variable for accept_changes file --- setup/so-setup | 4 ++-- setup/so-variables | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/setup/so-setup b/setup/so-setup index 24089dffc..e8993c1da 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -55,7 +55,7 @@ while [[ $# -gt 0 ]]; do done is_reinstall=false -if [[ -f $change_file ]]; then +if [[ -f /root/accept_changes ]]; then is_reinstall=true # Move last setup log to backup @@ -425,9 +425,9 @@ fi if [[ $is_manager || $is_import ]]; then whiptail_so_allow; fi whiptail_make_changes -touch $change_file # From here on changes will be made. +echo "1" > /root/accept_changes if [[ $is_reinstall ]]; then reinstall_init diff --git a/setup/so-variables b/setup/so-variables index 8c85954c2..83b9b4325 100644 --- a/setup/so-variables +++ b/setup/so-variables @@ -21,9 +21,6 @@ export node_es_port setup_log="/root/sosetup.log" export setup_log -change_file="/root/accept_changes" -export change_file - filesystem_root=$(df / | awk '$3 ~ /[0-9]+/ { print $2 * 1000 }') export filesystem_root