From be26a54ebb3fc5e14ac0fabdb77cc3bc7226cb49 Mon Sep 17 00:00:00 2001
From: rootzoll <christian@geektank.de>
Date: Thu, 16 Jan 2020 18:52:28 +0100
Subject: [PATCH] #892 fallback to copy

---
 home.admin/_bootstrap.sh                       | 10 ++++++++++
 home.admin/config.scripts/blitz.touchscreen.sh |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/home.admin/_bootstrap.sh b/home.admin/_bootstrap.sh
index 3c8140681..5bd13f60b 100644
--- a/home.admin/_bootstrap.sh
+++ b/home.admin/_bootstrap.sh
@@ -396,6 +396,7 @@ if [ ${#network} -gt 0 ] && [ ${#chain} -gt 0 ]; then
   fi
 
   echo "updating admin user LND data" >> $logFile
+  sudo mkdir -p /home/admin/.lnd/data/chain/${network}/${chain}net 2>/dev/null
   sudo cp /mnt/hdd/lnd/lnd.conf /home/admin/.lnd/lnd.conf 2>> $logFile
   sudo chown admin:admin /home/admin/.lnd/lnd.conf 2>> $logFile
   sudo cp /mnt/hdd/lnd/tls.cert /home/admin/.lnd/tls.cert 2>> $logFile
@@ -403,6 +404,15 @@ if [ ${#network} -gt 0 ] && [ ${#chain} -gt 0 ]; then
   sudo cp /mnt/hdd/lnd/data/chain/${network}/${chain}net/admin.macaroon /home/admin/.lnd/data/chain/${network}/${chain}net/admin.macaroon 2>/dev/null
   sudo chown admin:admin /home/admin/.lnd/data/chain/${network}/${chain}net/admin.macaroon 2>> $logFile
 
+  echo "updating pi user LND data (just read & invoice)" >> $logFile
+  sudo mkdir -p /home/pi/.lnd/data/chain/${network}/${chain}net/ 2>/dev/null
+  sudo cp /mnt/hdd/lnd/tls.cert /home/pi/.lnd/tls.cert 2>> $logFile
+  sudo chown pi:pi /home/pi/.lnd/tls.cert 2>> $logFile
+  sudo cp /mnt/hdd/lnd/data/chain/${network}/${chain}net/readonly.macaroon /home/pi/.lnd/data/chain/${network}/${chain}net/readonly.macaroon 2>/dev/null
+  sudo chown pi:pi /home/pi/.lnd/data/chain/${network}/${chain}net/readonly.macaroon 2>> $logFile
+  sudo cp /mnt/hdd/lnd/data/chain/${network}/${chain}net/invoice.macaroon /home/pi/.lnd/data/chain/${network}/${chain}net/invoice.macaroon 2>/dev/null
+  sudo chown pi:pi /home/pi/.lnd/data/chain/${network}/${chain}net/invoice.macaroon 2>> $logFile
+
 else 
   echo "skipping admin user LND data update" >> $logFile
 fi
diff --git a/home.admin/config.scripts/blitz.touchscreen.sh b/home.admin/config.scripts/blitz.touchscreen.sh
index 43bced54d..19eb6d833 100644
--- a/home.admin/config.scripts/blitz.touchscreen.sh
+++ b/home.admin/config.scripts/blitz.touchscreen.sh
@@ -2,6 +2,7 @@
 # see issue: https://github.com/rootzoll/raspiblitz/issues/646
 # and issue: https://github.com/rootzoll/raspiblitz/issues/809
 # to work it needs to be based on Raspbian Desktop base image
+# to check debug logs: sudo cat /home/pi/.cache/lxsession/LXDE-pi/run.log
 
 source /home/admin/raspiblitz.info
 source /mnt/hdd/raspiblitz.conf
@@ -98,10 +99,9 @@ EOF
   # remove minimize, maximize, close from titlebar
   sudo sed -i -E 's/titleLayout>LIMC/titleLayout>L/g' /etc/xdg/openbox/lxde-pi-rc.xml
 
-  # link over the macaroons/tls to pi user
-  # invoice & read macarrons have permissions to be read by pi user
-  # and just linking the base directory it should be flexible to work also with testnet or litecoin
-  sudo ln -s /mnt/hdd/lnd /home/pi/.lnd
+  # make sure that the directory for tls & macaroons exists
+  # fresh copy will be put there by bootstrap script on every start- restart needed
+  sudo mkdir -p /home/pi/.lnd 2>/dev/null
 
   # rotate touchscreen based on if LCD is rotated
   if [ "${lcdrotate}" = "1" ]; then