simplyfied presync

This commit is contained in:
rootzoll
2018-12-10 13:06:55 +01:00
parent b7802b8f6f
commit 3482c58eb0
4 changed files with 17 additions and 16 deletions

View File

@@ -97,7 +97,7 @@ while :
source /home/admin/raspiblitz.info source /home/admin/raspiblitz.info
if [ "${state}" = "presync" ]; then if [ "${state}" = "presync" ]; then
# get blockchain sync progress # get blockchain sync progress
blockchaininfo="$(bitcoin-cli -datadir=/mnt/hdd/bitcoin getblockchaininfo 2>/dev/null)" blockchaininfo="$(sudo -u root bitcoin-cli -conf=/home/admin/assets/bitcoin.conf getblockchaininfo 2>/dev/null)"
if [ ${#blockchaininfo} -gt 0 ]; then if [ ${#blockchaininfo} -gt 0 ]; then
message="$(echo "${blockchaininfo}" | jq -r '.verificationprogress')" message="$(echo "${blockchaininfo}" | jq -r '.verificationprogress')"
fi fi

View File

@@ -16,14 +16,14 @@ if [ ${bootstrapInfoExists} -eq 1 ]; then
echo "********************************************" echo "********************************************"
echo "Stopping pre-sync ... pls wait (up to 1min)" echo "Stopping pre-sync ... pls wait (up to 1min)"
echo "********************************************" echo "********************************************"
sudo systemctl stop bitcoind.service sudo -u root bitcoin-cli -conf=/home/admin/assets/bitcoin.conf stop
sudo systemctl disable bitcoind.service echo "bitcoind called to stop .."
sudo rm /mnt/hdd/bitcoin/bitcoin.conf sleep 10
sudo rm /etc/systemd/system/bitcoind.service
sudo unlink /home/bitcoin/.bitcoin
# unmount the temporary mount # unmount the temporary mount
echo "Unmount HDD .."
sudo umount -l /mnt/hdd sudo umount -l /mnt/hdd
sleep 3
# update info file # update info file
state=waitsetup state=waitsetup

View File

@@ -15,7 +15,7 @@ infoFile="/home/admin/raspiblitz.info"
#sudo systemctl stop bitcoind.service 2>/dev/null #sudo systemctl stop bitcoind.service 2>/dev/null
#sudo systemctl disable bitcoind.service 2>/dev/null #sudo systemctl disable bitcoind.service 2>/dev/null
echo "presync: bitcoind" >> $logFile #echo "presync: bitcoind" >> $logFile
#sudo cp /home/admin/assets/bitcoin.conf /mnt/hdd/bitcoin/bitcoin.conf #sudo cp /home/admin/assets/bitcoin.conf /mnt/hdd/bitcoin/bitcoin.conf
#sudo cp /home/admin/assets/bitcoind.service /etc/systemd/system/bitcoind.service #sudo cp /home/admin/assets/bitcoind.service /etc/systemd/system/bitcoind.service
#sudo chmod +x /etc/systemd/system/bitcoind.service #sudo chmod +x /etc/systemd/system/bitcoind.service
@@ -24,10 +24,10 @@ echo "presync: bitcoind" >> $logFile
#sudo systemctl daemon-reload #sudo systemctl daemon-reload
#sudo systemctl enable bitcoind.service #sudo systemctl enable bitcoind.service
#sudo systemctl start bitcoind.service #sudo systemctl start bitcoind.service
sudo chown -R bitcoin:bitcoin /mnt/hdd/bitcoin #sudo chown -R bitcoin:bitcoin /mnt/hdd/bitcoin
sudo -u bitcoin /usr/local/bin/bitcoind -daemon -conf=/home/admin/assets/bitcoin.conf -pid=/mnt/hdd/bitcoin/bitcoind.pid #sudo -u bitcoin /usr/local/bin/bitcoind -daemon -conf=/home/admin/assets/bitcoin.conf -pid=/mnt/hdd/bitcoin/bitcoind.pid
echo "presync: started" >> $logFile #echo "presync: started" >> $logFile
# update info file # update info file
echo "state=presync" > $infoFile #echo "state=presync" > $infoFile
sudo sed -i "s/^message=.*/message='running pre-sync'/g" ${infoFile} #sudo sed -i "s/^message=.*/message='running pre-sync'/g" ${infoFile}

View File

@@ -187,7 +187,7 @@ if [ ${hddIsAutoMounted} -eq 0 ]; then
# update info file # update info file
echo "state=presync" > $infoFile echo "state=presync" > $infoFile
echo "message='starting pre-sync'" >> $infoFile echo "message='starting presync'" >> $infoFile
# activating presync # activating presync
# so that on a hackathon you can just connect a RaspiBlitz # so that on a hackathon you can just connect a RaspiBlitz
@@ -199,9 +199,10 @@ if [ ${hddIsAutoMounted} -eq 0 ]; then
echo "starting pre-sync in background" >> $logFile echo "starting pre-sync in background" >> $logFile
# starting in background, because this scripts is part of systemd # starting in background, because this scripts is part of systemd
# so to change systemd needs to happen after delay in seperate process # so to change systemd needs to happen after delay in seperate process
/home/admin/_bootstrap.presync.sh & sudo chown -R bitcoin:bitcoin /mnt/hdd/bitcoin 2>> $logFile
echo "done" >> $logFile sudo -u bitcoin /usr/local/bin/bitcoind -daemon -conf=/home/admin/assets/bitcoin.conf -pid=/mnt/hdd/bitcoin/bitcoind.pid 2>> $logFile
echo "OK Started bitcoind for presync" >> $logFile
sudo sed -i "s/^message=.*/message='running presync'/g" ${infoFile}
# after admin login, presync will be stoped and HDD unmounted # after admin login, presync will be stoped and HDD unmounted
exit 0 exit 0