From 52732355543bbfa0844761b3f60f583bc3981cf2 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@acidhou.se>
Date: Fri, 4 Oct 2019 06:46:23 -0700
Subject: [PATCH] testing more

---
 fix-raspian-defaults/01-install-to-boot.sh                | 8 ++++----
 fix-raspian-defaults/rc.local.txt                         | 7 ++++---
 .../{root => root.overlay}/boot/per-boot.d/00keep.sh      | 0
 .../{root => root.overlay}/boot/per-once.d/00-bash.sh     | 0
 .../{root => root.overlay}/boot/per-once.d/01-set-time.sh | 0
 .../{root => root.overlay}/boot/per-once.d/05-packages.sh | 0
 .../boot/per-once.d/10-install-command-not-found.sh       | 0
 .../boot/per-once.d/99-setup-keys.sh                      | 0
 .../boot/per-once.d/packagelist.txt                       | 0
 .../{root => root.overlay}/etc/default/crda               | 0
 .../{root => root.overlay}/etc/default/keyboard           | 0
 .../{root => root.overlay}/etc/default/locale             | 0
 .../etc/systemd/system}/raspberrypi-initial-setup.service | 0
 .../{root => root.overlay}/usr/lib/raspi-ini/run-parts.sh | 0
 14 files changed, 8 insertions(+), 7 deletions(-)
 rename fix-raspian-defaults/{root => root.overlay}/boot/per-boot.d/00keep.sh (100%)
 rename fix-raspian-defaults/{root => root.overlay}/boot/per-once.d/00-bash.sh (100%)
 rename fix-raspian-defaults/{root => root.overlay}/boot/per-once.d/01-set-time.sh (100%)
 rename fix-raspian-defaults/{root => root.overlay}/boot/per-once.d/05-packages.sh (100%)
 rename fix-raspian-defaults/{root => root.overlay}/boot/per-once.d/10-install-command-not-found.sh (100%)
 rename fix-raspian-defaults/{root => root.overlay}/boot/per-once.d/99-setup-keys.sh (100%)
 rename fix-raspian-defaults/{root => root.overlay}/boot/per-once.d/packagelist.txt (100%)
 rename fix-raspian-defaults/{root => root.overlay}/etc/default/crda (100%)
 rename fix-raspian-defaults/{root => root.overlay}/etc/default/keyboard (100%)
 rename fix-raspian-defaults/{root => root.overlay}/etc/default/locale (100%)
 rename fix-raspian-defaults/{root/etc/systemd => root.overlay/etc/systemd/system}/raspberrypi-initial-setup.service (100%)
 rename fix-raspian-defaults/{root => root.overlay}/usr/lib/raspi-ini/run-parts.sh (100%)

diff --git a/fix-raspian-defaults/01-install-to-boot.sh b/fix-raspian-defaults/01-install-to-boot.sh
index 05f4f22..69c873e 100755
--- a/fix-raspian-defaults/01-install-to-boot.sh
+++ b/fix-raspian-defaults/01-install-to-boot.sh
@@ -32,12 +32,12 @@ function doinstall {
     fi
 
     # copy root overlay into FAT /boot partition
-    rsync -avP "$THISDIR/root" "$TARGET/root"
+    rsync -avP "$THISDIR/root.overlay/" "$TARGET/root.overlay/"
 
     # set hostname in overlay:
-    mkdir -p $TARGET/root/etc
-    echo "$NEWHOSTNAME" > "$TARGET/root/etc/hostname"
-    cat >> $TARGET/root/etc/hosts <<EOF
+    mkdir -p $TARGET/root.overlay/etc
+    echo "$NEWHOSTNAME" > "$TARGET/root.overlay/etc/hostname"
+    cat >> $TARGET/root.overlay/etc/hosts <<EOF
 127.0.0.1	localhost
 ::1		localhost ip6-localhost ip6-loopback
 ff02::1		ip6-allnodes
diff --git a/fix-raspian-defaults/rc.local.txt b/fix-raspian-defaults/rc.local.txt
index eefd3f9..69323d5 100644
--- a/fix-raspian-defaults/rc.local.txt
+++ b/fix-raspian-defaults/rc.local.txt
@@ -1,10 +1,11 @@
 #!/bin/sh  # can't assume bash yet
 
-if [ ! -d /boot/root ]; then
+if [ ! -d /boot/root.overlay ]; 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
+    rsync -avP /boot/root.overlay/ /
+    rm -rf /boot/rc.local.txt # we only need to run once
+    #FIXME also remove /boot/root.overlay dir when working
 fi
 
 reboot
diff --git a/fix-raspian-defaults/root/boot/per-boot.d/00keep.sh b/fix-raspian-defaults/root.overlay/boot/per-boot.d/00keep.sh
similarity index 100%
rename from fix-raspian-defaults/root/boot/per-boot.d/00keep.sh
rename to fix-raspian-defaults/root.overlay/boot/per-boot.d/00keep.sh
diff --git a/fix-raspian-defaults/root/boot/per-once.d/00-bash.sh b/fix-raspian-defaults/root.overlay/boot/per-once.d/00-bash.sh
similarity index 100%
rename from fix-raspian-defaults/root/boot/per-once.d/00-bash.sh
rename to fix-raspian-defaults/root.overlay/boot/per-once.d/00-bash.sh
diff --git a/fix-raspian-defaults/root/boot/per-once.d/01-set-time.sh b/fix-raspian-defaults/root.overlay/boot/per-once.d/01-set-time.sh
similarity index 100%
rename from fix-raspian-defaults/root/boot/per-once.d/01-set-time.sh
rename to fix-raspian-defaults/root.overlay/boot/per-once.d/01-set-time.sh
diff --git a/fix-raspian-defaults/root/boot/per-once.d/05-packages.sh b/fix-raspian-defaults/root.overlay/boot/per-once.d/05-packages.sh
similarity index 100%
rename from fix-raspian-defaults/root/boot/per-once.d/05-packages.sh
rename to fix-raspian-defaults/root.overlay/boot/per-once.d/05-packages.sh
diff --git a/fix-raspian-defaults/root/boot/per-once.d/10-install-command-not-found.sh b/fix-raspian-defaults/root.overlay/boot/per-once.d/10-install-command-not-found.sh
similarity index 100%
rename from fix-raspian-defaults/root/boot/per-once.d/10-install-command-not-found.sh
rename to fix-raspian-defaults/root.overlay/boot/per-once.d/10-install-command-not-found.sh
diff --git a/fix-raspian-defaults/root/boot/per-once.d/99-setup-keys.sh b/fix-raspian-defaults/root.overlay/boot/per-once.d/99-setup-keys.sh
similarity index 100%
rename from fix-raspian-defaults/root/boot/per-once.d/99-setup-keys.sh
rename to fix-raspian-defaults/root.overlay/boot/per-once.d/99-setup-keys.sh
diff --git a/fix-raspian-defaults/root/boot/per-once.d/packagelist.txt b/fix-raspian-defaults/root.overlay/boot/per-once.d/packagelist.txt
similarity index 100%
rename from fix-raspian-defaults/root/boot/per-once.d/packagelist.txt
rename to fix-raspian-defaults/root.overlay/boot/per-once.d/packagelist.txt
diff --git a/fix-raspian-defaults/root/etc/default/crda b/fix-raspian-defaults/root.overlay/etc/default/crda
similarity index 100%
rename from fix-raspian-defaults/root/etc/default/crda
rename to fix-raspian-defaults/root.overlay/etc/default/crda
diff --git a/fix-raspian-defaults/root/etc/default/keyboard b/fix-raspian-defaults/root.overlay/etc/default/keyboard
similarity index 100%
rename from fix-raspian-defaults/root/etc/default/keyboard
rename to fix-raspian-defaults/root.overlay/etc/default/keyboard
diff --git a/fix-raspian-defaults/root/etc/default/locale b/fix-raspian-defaults/root.overlay/etc/default/locale
similarity index 100%
rename from fix-raspian-defaults/root/etc/default/locale
rename to fix-raspian-defaults/root.overlay/etc/default/locale
diff --git a/fix-raspian-defaults/root/etc/systemd/raspberrypi-initial-setup.service b/fix-raspian-defaults/root.overlay/etc/systemd/system/raspberrypi-initial-setup.service
similarity index 100%
rename from fix-raspian-defaults/root/etc/systemd/raspberrypi-initial-setup.service
rename to fix-raspian-defaults/root.overlay/etc/systemd/system/raspberrypi-initial-setup.service
diff --git a/fix-raspian-defaults/root/usr/lib/raspi-ini/run-parts.sh b/fix-raspian-defaults/root.overlay/usr/lib/raspi-ini/run-parts.sh
similarity index 100%
rename from fix-raspian-defaults/root/usr/lib/raspi-ini/run-parts.sh
rename to fix-raspian-defaults/root.overlay/usr/lib/raspi-ini/run-parts.sh