From ccb8af48609884b93374fa6d8fdd478a5a5293aa Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Tue, 12 Feb 2019 22:15:52 +0100
Subject: [PATCH] moved check for raspiblitz.conf earlier

---
 home.admin/10setupBlitz.sh | 13 +++++++++++++
 home.admin/70initLND.sh    | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/home.admin/10setupBlitz.sh b/home.admin/10setupBlitz.sh
index 70e7cb5..6eb5ad1 100755
--- a/home.admin/10setupBlitz.sh
+++ b/home.admin/10setupBlitz.sh
@@ -123,6 +123,19 @@ fi #end - when bitcoin is running
 mountOK=$( sudo cat /etc/fstab | grep -c '/mnt/hdd' )
 if [ ${mountOK} -eq 1 ]; then
   
+  # FAILSAFE: check if raspiblitz.conf is available
+  configExists=$(ls /mnt/hdd/raspiblitz.conf | grep -c '.conf')
+  if [ ${configExists} -eq 0 ]; then
+    echo ""
+    echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+    echo "FAIL: /mnt/hdd/raspiblitz.conf should exists at this point, but not found!"
+    echo "Please report to: https://github.com/rootzoll/raspiblitz/issues/293"
+    echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+    echo "Press ENTER to EXIT."
+    read key
+    exit 1
+  fi
+
   # are there any signs of blockchain data and activity
   # setup running with admin user, but has no permission to read /mnt/hdd/bitcoin/blocks/, sudo needed
   blockchainDataExists=$(sudo ls /mnt/hdd/${network}/blocks/blk00000.dat 2>/dev/null | grep -c '.dat')
diff --git a/home.admin/70initLND.sh b/home.admin/70initLND.sh
index 9d8f112..3d39e66 100755
--- a/home.admin/70initLND.sh
+++ b/home.admin/70initLND.sh
@@ -1,19 +1,6 @@
 #!/bin/bash
 echo ""
 
-# check if raspiblitz.conf is available
-configExists=$(ls /mnt/hdd/raspiblitz.conf | grep -c '.conf')
-if [ ${configExists} -eq 0 ]; then
-  echo ""
-  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-  echo "FAIL: /mnt/hdd/raspiblitz.conf should exists at this point, but not found!"
-  echo "Please report to: https://github.com/rootzoll/raspiblitz/issues/293"
-  echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-  echo "Press ENTER to EXIT."
-  read key
-  exit 1
-fi
-
 ## get basic info
 source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf