From 3e7cba20ce0c0c1918bf4d42339a8d45734dbb66 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@acidhou.se>
Date: Fri, 4 Oct 2019 06:57:35 -0700
Subject: [PATCH] latest for testing

---
 fix-raspian-defaults/rc.local.txt                        | 6 ++++--
 fix-raspian-defaults/root.overlay/etc/default/keyboard   | 9 ++-------
 .../root.overlay/usr/lib/raspi-ini/run-parts.sh          | 4 ++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/fix-raspian-defaults/rc.local.txt b/fix-raspian-defaults/rc.local.txt
index 69323d5..35dac77 100644
--- a/fix-raspian-defaults/rc.local.txt
+++ b/fix-raspian-defaults/rc.local.txt
@@ -4,8 +4,10 @@ if [ ! -d /boot/root.overlay ]; then
     logger -s -t rc.local.txt cant find root overlay in /boot
 else
     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
+    ln -s /etc/systemd/system/raspberrypi-initial-setup.service \
+        /etc/systemd/system/multi-user.target.wants/raspberrypi-initial-setup.service
+    # we only need to run once
+    rm -rf /boot/rc.local.txt /boot/root.overlay
 fi
 
 reboot
diff --git a/fix-raspian-defaults/root.overlay/etc/default/keyboard b/fix-raspian-defaults/root.overlay/etc/default/keyboard
index 3fecbcc..06a4805 100644
--- a/fix-raspian-defaults/root.overlay/etc/default/keyboard
+++ b/fix-raspian-defaults/root.overlay/etc/default/keyboard
@@ -1,10 +1,5 @@
-# KEYBOARD CONFIGURATION FILE
+# # KEYBOARD CONFIGURATION FILE
 
 # Consult the keyboard(5) manual page.
 
-XKBMODEL="pc105"
-XKBLAYOUT="us"
-XKBVARIANT=""
-XKBOPTIONS=""
-
-BACKSPACE="guess"
+# blank
diff --git a/fix-raspian-defaults/root.overlay/usr/lib/raspi-ini/run-parts.sh b/fix-raspian-defaults/root.overlay/usr/lib/raspi-ini/run-parts.sh
index ed49aa1..c9f96dd 100644
--- a/fix-raspian-defaults/root.overlay/usr/lib/raspi-ini/run-parts.sh
+++ b/fix-raspian-defaults/root.overlay/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 | logger -s -t run-per-once
 
 # Rename every per-once script
 for f in /boot/per-once.d/*.sh; do
@@ -12,4 +12,4 @@ for f in /boot/per-once.d/*.sh; do
 done
 
 # Run every per-boot script
-run-parts --regex '.*\.sh$' /boot/per-boot.d
+run-parts --regex '.*\.sh$' /boot/per-boot.d | logger -s -t run-per-boot