diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh index db3d530cf..8becf0e75 100755 --- a/home.admin/_bootstrap.sh +++ b/home.admin/_bootstrap.sh @@ -488,7 +488,7 @@ if [ ${isMounted} -eq 0 ]; then fi fi - echo "Calling _bootstrap.provision.sh for general system provisioning .." >> $logFile + echo "Calling _bootstrap.provision.sh for general system provisioning (${setupPhase}) .." >> $logFile sudo /home/admin/_provision_.sh if [ "$?" != "0" ]; then echo "EXIT BECAUSE OF ERROR STATE" >> $logFile diff --git a/home.admin/_provision_.sh b/home.admin/_provision_.sh index c620a0b4f..e0d47657e 100755 --- a/home.admin/_provision_.sh +++ b/home.admin/_provision_.sh @@ -35,7 +35,6 @@ if [ ${parameterExists} -eq 0 ]; then fi # import config values -sudo chmod 777 ${configFile} source ${configFile} ########################## @@ -124,11 +123,10 @@ fi #sudo ln -s /mnt/hdd/ssh /etc/ssh >> ${logFile} 2>&1 #sudo /home/admin/config.scripts/blitz.systemd.sh update-sshd >> ${logFile} 2>&1 -# optimze if RAM >1GB +# optimze mempool if RAM >1GB kbSizeRAM=$(cat /proc/meminfo | grep "MemTotal" | sed 's/[^0-9]*//g') if [ ${kbSizeRAM} -gt 1500000 ]; then echo "Detected RAM >1GB --> optimizing ${network}.conf" - sudo sed -i "s/^dbcache=.*/dbcache=1024/g" /mnt/hdd/${network}/${network}.conf sudo sed -i "s/^maxmempool=.*/maxmempool=300/g" /mnt/hdd/${network}/${network}.conf fi if [ ${kbSizeRAM} -gt 3500000 ]; then diff --git a/home.admin/setup.scripts/setupDialogControl.sh b/home.admin/setup.scripts/setupDialogControl.sh index 794c86da7..fb1ca9fe4 100755 --- a/home.admin/setup.scripts/setupDialogControl.sh +++ b/home.admin/setup.scripts/setupDialogControl.sh @@ -31,6 +31,7 @@ if [ "${setupPhase}" == "update" ]; then else # default to normal setup options setupPhase="setup" + sudo sed -i "s/^setupPhase=.*/setupPhase='setup'/g" /home/admin/raspiblitz.info echo "# you refused recovery option - defaulting to normal setup" fi fi @@ -47,7 +48,7 @@ if [ "${setupPhase}" == "recovery" ]; then else # default to normal setup options setupPhase="setup" - sudo sed -i "s/^=setupPhase.*/state=setupPhase/g" /home/admin/raspiblitz.info + sudo sed -i "s/^setupPhase=.*/setupPhase='setup'/g" /home/admin/raspiblitz.info echo "# you refused recovery option - defaulting to normal setup" fi fi @@ -69,7 +70,7 @@ if [ "${setupPhase}" == "migration" ]; then else # on cancel - default to normal setup setupPhase="setup" - sudo sed -i "s/^=setupPhase.*/state=setupPhase/g" /home/admin/raspiblitz.info + sudo sed -i "s/^setupPhase=.*/setupPhase='setup'/g" /home/admin/raspiblitz.info echo "# you refused node migration option - defaulting to normal setup" exit 1 fi