From 0c72b2c372e7109ab716b22f47a514ec97976d56 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@acidhou.se>
Date: Fri, 4 Oct 2019 06:41:13 -0700
Subject: [PATCH] almost working

---
 .../02-borg-via-ssh.sh                        |  7 ++--
 fix-raspian-defaults/01-install-to-boot.sh    | 35 +++++++++++++++++--
 fix-raspian-defaults/rc.local.txt             | 10 ++++++
 fix-raspian-defaults/root/etc/rc.local        | 24 -------------
 .../root/etc/setup/configure-pi.sh            |  5 ---
 .../systemd/raspberrypi-initial-setup.service |  3 +-
 .../root/usr/lib/raspi-ini/run-parts.sh       |  2 +-
 7 files changed, 48 insertions(+), 38 deletions(-)
 rename {fix-raspian-defaults => attic}/02-borg-via-ssh.sh (85%)
 create mode 100644 fix-raspian-defaults/rc.local.txt
 delete mode 100644 fix-raspian-defaults/root/etc/rc.local
 delete mode 100644 fix-raspian-defaults/root/etc/setup/configure-pi.sh

diff --git a/fix-raspian-defaults/02-borg-via-ssh.sh b/attic/02-borg-via-ssh.sh
similarity index 85%
rename from fix-raspian-defaults/02-borg-via-ssh.sh
rename to attic/02-borg-via-ssh.sh
index 1680010..5449b31 100755
--- a/fix-raspian-defaults/02-borg-via-ssh.sh
+++ b/attic/02-borg-via-ssh.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [ "$#" -ne 1 ]; then
-    echo "usage: $0 <hostname>"
+    echo "usage: $0 <newhostname>"
     exit 1
 fi
 
@@ -31,7 +31,6 @@ tar -c ./root | $SS ssh $SSH_OPTIONS pi@raspberrypi.local "
     sudo chmod ugoa+rx /tmp/setup &&
     cd /tmp/setup &&
     sudo tar xvf - &&
-    sudo rsync -avP /tmp/setup/root/ / ;
-    nohup sudo bash /etc/rc.local &
-    tail -f /var/log/messages
+    sudo rsync -avP /tmp/setup/root/ / &&
+    reboot ;
 "
diff --git a/fix-raspian-defaults/01-install-to-boot.sh b/fix-raspian-defaults/01-install-to-boot.sh
index 9c41b2d..05f4f22 100755
--- a/fix-raspian-defaults/01-install-to-boot.sh
+++ b/fix-raspian-defaults/01-install-to-boot.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+THISDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
 function die {
     echo "$1" > /dev/stderr
     exit 1
@@ -9,10 +11,18 @@ function info {
     echo "$1" > /dev/stderr
 }
 
+if [ "$#" -ne 1 ]; then
+    die "usage: $0 <newhostname>"
+fi
+
+NEWHOSTNAME="$1"
+
 function doinstall {
+
     # assumes osx
     [[ "$(uname -s)" != "Darwin" ]] && die "need osx"
 
+
     TARGET="/Volumes/boot"
 
     if [[ ! -e "$TARGET/LICENCE.broadcom" ]]; then
@@ -21,11 +31,30 @@ function doinstall {
         info "rpi boot dir found at $TARGET"
     fi
 
-    info "disabling partition resize"
-    sed -i '' -e 's/init=[^[:space:]]*//' "$TARGET/cmdline.txt"
+    # copy root overlay into FAT /boot partition
+    rsync -avP "$THISDIR/root" "$TARGET/root"
 
-    info "copying setup files to disk"
+    # set hostname in overlay:
+    mkdir -p $TARGET/root/etc
+    echo "$NEWHOSTNAME" > "$TARGET/root/etc/hostname"
+    cat >> $TARGET/root/etc/hosts <<EOF
+127.0.0.1	localhost
+::1		localhost ip6-localhost ip6-loopback
+ff02::1		ip6-allnodes
+ff02::2		ip6-allrouters
 
+127.0.1.1	$NEWHOSTNAME
+EOF
+
+    rsync -avP "$THISDIR/rc.local.txt" "$TARGET/rc.local.txt"
+
+    # fixed in my image
+    # 2019-09-26-raspbian-buster-lite-patched-rclocal-noresizeroot.zip
+    #info "disabling partition resize"
+    #sed -i '' -e 's/init=[^[:space:]]*//' "$TARGET/cmdline.txt"
+
+    sync
+    diskutil eject $TARGET
 }
 
 doinstall
diff --git a/fix-raspian-defaults/rc.local.txt b/fix-raspian-defaults/rc.local.txt
new file mode 100644
index 0000000..eefd3f9
--- /dev/null
+++ b/fix-raspian-defaults/rc.local.txt
@@ -0,0 +1,10 @@
+#!/bin/sh  # can't assume bash yet
+
+if [ ! -d /boot/root ]; then
+    logger -s -t rc.local.txt cant find root overlay in /boot
+else
+    rsync -avP /boot/root/ / && \
+    rm -rf /boot/root /boot/rc.local.txt # we only need to run once
+fi
+
+reboot
diff --git a/fix-raspian-defaults/root/etc/rc.local b/fix-raspian-defaults/root/etc/rc.local
deleted file mode 100644
index 269ad2e..0000000
--- a/fix-raspian-defaults/root/etc/rc.local
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh -e
-#
-# rc.local
-#
-# This script is executed at the end of each multiuser runlevel.
-# Make sure that the script will "exit 0" on success or any other
-# value on error.
-#
-# In order to enable or disable this script just change the execution
-# bits.
-#
-# By default this script does nothing.
-
-# Print the IP address
-_IP=$(hostname -I) || true
-if [ "$_IP" ]; then
-  printf "My IP address is %s\n" "$_IP"
-fi
-
-if [ -e /boot/rc.local.txt ]; then
-  . /boot/rc.local.txt
-fi
-
-exit 0
diff --git a/fix-raspian-defaults/root/etc/setup/configure-pi.sh b/fix-raspian-defaults/root/etc/setup/configure-pi.sh
deleted file mode 100644
index 6ac293b..0000000
--- a/fix-raspian-defaults/root/etc/setup/configure-pi.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-whoami
-uptime
-cat /etc/rc.local
diff --git a/fix-raspian-defaults/root/etc/systemd/raspberrypi-initial-setup.service b/fix-raspian-defaults/root/etc/systemd/raspberrypi-initial-setup.service
index 3eb41fd..819f540 100644
--- a/fix-raspian-defaults/root/etc/systemd/raspberrypi-initial-setup.service
+++ b/fix-raspian-defaults/root/etc/systemd/raspberrypi-initial-setup.service
@@ -1,7 +1,8 @@
 [Unit]
 Description=Run user provided scripts on boot
 ConditionPathExists=/usr/lib/raspi-ini/run-parts.sh
-After=dhcpcd.service # Need to put more thought into when
+After=network-online.target
+Wants=network-online.target
 
 [Service]
 Type=oneshot
diff --git a/fix-raspian-defaults/root/usr/lib/raspi-ini/run-parts.sh b/fix-raspian-defaults/root/usr/lib/raspi-ini/run-parts.sh
index 8e7e139..ed49aa1 100644
--- a/fix-raspian-defaults/root/usr/lib/raspi-ini/run-parts.sh
+++ b/fix-raspian-defaults/root/usr/lib/raspi-ini/run-parts.sh
@@ -4,7 +4,7 @@
 shopt -s nullglob
 
 # Run every per-once script
-run-parts --regex '.*\.sh$' /boot/per-once.d
+run-parts --regex '.*\.sh$' /boot/per-once.d | 
 
 # Rename every per-once script
 for f in /boot/per-once.d/*.sh; do