From 0126005b902add8b6cd5ddf8ed313907669e024a Mon Sep 17 00:00:00 2001 From: openoms <43343391+openoms@users.noreply.github.com> Date: Sun, 10 Mar 2024 20:39:14 +0000 Subject: [PATCH] fixes for pruned node start (#149) * increase required space for pruned chain download * don't protect home as bitcoind binary is there * format UDPATE menu --- scripts/_functions.bitcoincore.sh | 2 -- scripts/menu.update.sh | 2 +- scripts/standalone/_functions.standalone.sh | 14 +++++++------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/scripts/_functions.bitcoincore.sh b/scripts/_functions.bitcoincore.sh index 3952d4d..4b27a91 100755 --- a/scripts/_functions.bitcoincore.sh +++ b/scripts/_functions.bitcoincore.sh @@ -185,8 +185,6 @@ StandardError=journal PrivateTmp=true # Mount /usr, /boot/ and /etc read-only for the process. ProtectSystem=full -# Deny access to /home, /root and /run/user -ProtectHome=true # Disallow the process and all of its children to gain # new privileges through execve(). NoNewPrivileges=true diff --git a/scripts/menu.update.sh b/scripts/menu.update.sh index 336aca3..e854304 100755 --- a/scripts/menu.update.sh +++ b/scripts/menu.update.sh @@ -4,7 +4,7 @@ source /home/joinmarket/_functions.sh # BASIC MENU INFO HEIGHT=15 -WIDTH=56 +WIDTH=57 CHOICE_HEIGHT=4 TITLE="Update options" MENU=" diff --git a/scripts/standalone/_functions.standalone.sh b/scripts/standalone/_functions.standalone.sh index d80d2eb..7985a60 100755 --- a/scripts/standalone/_functions.standalone.sh +++ b/scripts/standalone/_functions.standalone.sh @@ -49,13 +49,13 @@ function downloadSnapShot() { echo "# Check available diskspace" FREE=$(df -k --output=avail "$PWD" | tail -n1) # df -k not df -h - if [ $FREE -lt 12582912 ]; then # 12G = 12*1024*1024k + if [ $FREE -lt 21000000 ]; then echo "# The free space is only $FREE bytes!" - echo "# Would need ~12GB free space to download and extract the snapshot." + echo "# Would need ~21GB free space to download and extract the snapshot." echo "# Press ENTER to continue to download regardless or CTRL+C to exit." read key else - echo "# OK, more than 12GB is free!" + echo "# OK, more than 21GB is free!" fi sudo -u joinmarket mkdir /home/joinmarket/download 2>/dev/null cd /home/joinmarket/download || exit 1 @@ -107,13 +107,13 @@ function downloadSnapShot() { echo "# Extracting to /home/store/app-data/.bitcoin ..." FREE=$(df -k --output=avail "$PWD" | tail -n1) # df -k not df -h - if [ $FREE -lt 7340032 ]; then # 7G = 7*1024*1024k + if [ $FREE -lt 11000000 ]; then echo "# The free space is only $FREE bytes!" - echo "# Would need ~7GB free space to extract the snapshot." - echo "# Press ENTER to continue to download regardless or CTRL+C to exit." + echo "# Would need ~11GB free space to extract the snapshot." + echo "# Press ENTER to continue to extract it regardless or CTRL+C to exit." read key else - echo "# OK, more than 7GB is free!" + echo "# OK, more than 11GB is free!" fi addUserStore if [ ! -d /home/store/app-data/.bitcoin ]; then