From cc9b6432ad596d22e3f74df9a66f48327e581557 Mon Sep 17 00:00:00 2001
From: chiefwigms <chiefwigms@hotmail.com>
Date: Thu, 25 Jun 2020 07:25:37 -0600
Subject: [PATCH] Working boot

---
 scripts/pi/_readme.txt  |  1 +
 scripts/pi/firstboot.sh | 28 +++++++++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/scripts/pi/_readme.txt b/scripts/pi/_readme.txt
index 067fef7..0b847e6 100644
--- a/scripts/pi/_readme.txt
+++ b/scripts/pi/_readme.txt
@@ -1,6 +1,7 @@
 Creating a custom image:
 Download lastest Lite image from https://www.raspberrypi.org/downloads/raspberry-pi-os/
 Download firstboot.service from https://github.com/nmcclain/raspberian-firstboot
+(Remove ExecStartPost from firstboot.service - script will rename itself)
 Extract img from zip
 
 mkdir mnt boot
diff --git a/scripts/pi/firstboot.sh b/scripts/pi/firstboot.sh
index a2f2c28..74c80c2 100644
--- a/scripts/pi/firstboot.sh
+++ b/scripts/pi/firstboot.sh
@@ -56,6 +56,16 @@ apt -y update
 apt -y --autoremove purge ifupdown dhcpcd5 isc-dhcp-client isc-dhcp-common rsyslog avahi-daemon
 apt-mark hold ifupdown dhcpcd5 isc-dhcp-client isc-dhcp-common rsyslog raspberrypi-net-mods openresolv avahi-daemon libnss-mdns
 apt -y install libnss-resolve hostapd dnsmasq samba git python3 python3-pip
+
+# Install Picobrew server
+cd /
+git clone https://github.com/chiefwigms/picobrew_pico.git
+cd /picobrew_pico
+git update-index --assume-unchanged config.yaml
+pip3 install -r requirements.txt
+cd /
+
+# Setup Hostapd
 rm -rf /etc/network /etc/dhcp
 systemctl enable systemd-networkd.service systemd-resolved.service
 systemctl unmask hostapd.service
@@ -223,22 +233,15 @@ service smbd restart
 # Startup Script
 sed -i 's/exit 0//g' /etc/rc.local
 cat >> /etc/rc.local <<EOF
-if [ ! -d "/picobrew_pico" ]
+if [ -d "/picobrew_pico" ]
 then
-  echo 'Installing Picobrew Server...'
-  cd /
-  git clone https://github.com/chiefwigms/picobrew_pico.git
-  cd /picobrew_pico
-  git update-index --assume-unchanged config.yaml
-  pip3 install -r requirements.txt
-else
   echo 'Updating Picobrew Server...'
   cd /picobrew_pico
   git pull
   pip3 install -r requirements.txt
+  echo 'Starting Picobrew Server...'
+  python3 server.py &
 fi
-echo 'Starting Picobrew Server...'
-python3 server.py &
 
 exit 0
 EOF
@@ -247,5 +250,8 @@ EOF
 #systemctl enable apt-daily.timer
 #systemctl enable apt-daily-upgrade.timer
 
-(echo "Finished setup - Rebooting system in 10 seconds!"; sleep 10; reboot) &
+# Rename script
+mv /boot/firstboot.sh /boot/firstboot.done
 
+echo "Finished setup - rebooting now!"
+reboot