From 5f375b66e661e14384ed42e6e1c758f10600a259 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Mon, 10 Dec 2018 00:24:37 +0100
Subject: [PATCH] fix bootstrap service

---
 home.admin/_bootstrap.presync.sh    | 28 +++++++++++++++-------------
 home.admin/assets/bitcoin.conf      |  2 +-
 home.admin/assets/bootstrap.service |  5 ++---
 home.admin/assets/litecoin.conf     |  2 +-
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/home.admin/_bootstrap.presync.sh b/home.admin/_bootstrap.presync.sh
index 7f16bcf..0c362b7 100644
--- a/home.admin/_bootstrap.presync.sh
+++ b/home.admin/_bootstrap.presync.sh
@@ -8,22 +8,24 @@ logFile="/home/admin/raspiblitz.log"
 # used by display and later setup steps
 infoFile="/home/admin/raspiblitz.info"
 
-echo "presync: waiting 2 secs" >> $logFile
-sleep 2
+#echo "presync: waiting 2 secs" >> $logFile
+#sleep 2
 
 # just in case an old presync did not shutdown properly
-sudo systemctl stop bitcoind.service 2>/dev/null
-sudo systemctl disable bitcoind.service 2>/dev/null
+#sudo systemctl stop bitcoind.service 2>/dev/null
+#sudo systemctl disable bitcoind.service 2>/dev/null
 
-echo "presync: copying files" >> $logFile
-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 chmod +x /etc/systemd/system/bitcoind.service
-sudo ln -s /mnt/hdd/bitcoin /home/bitcoin/.bitcoin
-echo "presync: starting services" >> $logFile
-sudo systemctl daemon-reload
-sudo systemctl enable bitcoind.service
-sudo systemctl start bitcoind.service
+echo "presync: bitcoind" >> $logFile
+#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 chmod +x /etc/systemd/system/bitcoind.service
+#sudo ln -s /mnt/hdd/bitcoin /home/bitcoin/.bitcoin
+#echo "presync: starting services" >> $logFile
+#sudo systemctl daemon-reload
+#sudo systemctl enable bitcoind.service
+#sudo systemctl start bitcoind.service
+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
 echo "presync: started" >> $logFile
   
 # update info file
diff --git a/home.admin/assets/bitcoin.conf b/home.admin/assets/bitcoin.conf
index 4cf45d4..3b3ce33 100755
--- a/home.admin/assets/bitcoin.conf
+++ b/home.admin/assets/bitcoin.conf
@@ -22,4 +22,4 @@ maxmempool=50
 maxconnections=40
 maxuploadtarget=5000
 
-datadir=/home/bitcoin/.bitcoin
+datadir=/mnt/hdd/bitcoin
diff --git a/home.admin/assets/bootstrap.service b/home.admin/assets/bootstrap.service
index bb998f2..11244a5 100644
--- a/home.admin/assets/bootstrap.service
+++ b/home.admin/assets/bootstrap.service
@@ -2,17 +2,16 @@
 # /etc/systemd/system/bootstrap.service
 
 [Unit]
-Description=execute on every startup before everything else is starting
+Description=execute on every startup before everything else
 After=network.target
 
 [Service]
 User=root
 Group=root
 Type=oneshot
+RemainAfterExit=true
 ExecStart=/home/admin/_bootstrap.sh
-KillMode=process
 StandardOutput=journal
-Restart=no
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/home.admin/assets/litecoin.conf b/home.admin/assets/litecoin.conf
index 7d9d94e..eb094f2 100755
--- a/home.admin/assets/litecoin.conf
+++ b/home.admin/assets/litecoin.conf
@@ -26,4 +26,4 @@ maxuploadtarget=5000
 discardfee=0.00000001
 mintxfee=0.00000001
 minrelaytxfee=0.00000001
-datadir=/home/bitcoin/.litecoin
+datadir=/mnt/hdd/litecoin