diff --git a/setup/so-functions b/setup/so-functions index b4d52d3a3..3e1bce09d 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1430,21 +1430,20 @@ set_node_type() { } set_updates() { - echo "MASTERUPDATES is $MASTERUPDATES" - if [ $MASTERUPDATES == 'MASTER' ]; then - if [ $OS == 'centos' ]; then + if [ "$MASTERUPDATES" = 1 ]; then + echo "MASTERUPDATES is MASTER" + if [ $OS = 'centos' ]; then if ! grep -q $MSRV /etc/yum.conf; then echo "proxy=http://$MSRV:3142" >> /etc/yum.conf - fi - + fi else - # Set it up so the updates roll through the master echo "Acquire::http::Proxy \"http://$MSRV:3142\";" > /etc/apt/apt.conf.d/00Proxy echo "Acquire::https::Proxy \"http://$MSRV:3142\";" >> /etc/apt/apt.conf.d/00Proxy - - fi fi + else + echo "MASTERUPDATES is OPEN" + fi } set_version() { @@ -1464,4 +1463,4 @@ update_sudoers() { echo "User soremote already granted sudo privileges" fi -} +} \ No newline at end of file diff --git a/setup/so-setup b/setup/so-setup index cb06a1c07..6c863b1a3 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -142,7 +142,7 @@ if (whiptail_you_sure) ; then ## Helix ## #################### if [ $"INSTALLTYPE" == 'HELIXSENSOR' ]; then - MASTERUPDATES=OPEN + MASTERUPDATES=0 filter_unused_nics [[ "$SKIP_BOND" != 'yes' ]] && whiptail_bond_nics whiptail_helix_apikey diff --git a/setup/so-whiptail b/setup/so-whiptail index 63dc3944e..653892d5a 100755 --- a/setup/so-whiptail +++ b/setup/so-whiptail @@ -942,6 +942,12 @@ whiptail_master_updates() { "MASTER" "Master node is proxy for OS/Docker updates." ON \ "OPEN" "Each node connect to the Internet for updates" OFF 3>&1 1>&2 2>&3 ) + if [ "$MASTERUPDATES" == "MASTER" ]; then + MASTERUPDATES=1 + else + MASTERUPDATES=0 + fi + local exitstatus=$? whiptail_check_exitstatus $exitstatus