From d9f759a43ca81f938d863fe98d21b35ae82147c9 Mon Sep 17 00:00:00 2001
From: Jeffrey Paul <sneak@acidhou.se>
Date: Fri, 4 Oct 2019 08:10:07 -0700
Subject: [PATCH] latest

---
 .../root.overlay/boot/per-once.d/00-fixlocale.sh     |  4 ++++
 .../root.overlay/boot/per-once.d/05-packages.sh      |  6 ++----
 .../{99-setup-keys.sh => 98-setup-ssh-keys.sh}       | 12 ++++++++++--
 .../root.overlay/boot/per-once.d/99-enable-ssh.sh    |  4 ++++
 .../root.overlay/boot/per-once.d/packagelist.txt     |  1 -
 .../root.overlay/usr/lib/raspi-ini/run-parts.sh      |  2 +-
 6 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 fix-raspian-defaults/root.overlay/boot/per-once.d/00-fixlocale.sh
 rename fix-raspian-defaults/root.overlay/boot/per-once.d/{99-setup-keys.sh => 98-setup-ssh-keys.sh} (56%)
 create mode 100644 fix-raspian-defaults/root.overlay/boot/per-once.d/99-enable-ssh.sh

diff --git a/fix-raspian-defaults/root.overlay/boot/per-once.d/00-fixlocale.sh b/fix-raspian-defaults/root.overlay/boot/per-once.d/00-fixlocale.sh
new file mode 100644
index 0000000..8f1e4d6
--- /dev/null
+++ b/fix-raspian-defaults/root.overlay/boot/per-once.d/00-fixlocale.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen
+locale-gen
diff --git a/fix-raspian-defaults/root.overlay/boot/per-once.d/05-packages.sh b/fix-raspian-defaults/root.overlay/boot/per-once.d/05-packages.sh
index e256144..9a52969 100644
--- a/fix-raspian-defaults/root.overlay/boot/per-once.d/05-packages.sh
+++ b/fix-raspian-defaults/root.overlay/boot/per-once.d/05-packages.sh
@@ -2,7 +2,7 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-PKGS="$(cat $DIR/packages.txt)"
+PKGS="$(cat $DIR/packagelist.txt)"
 
 export DEBIAN_FRONTEND=noninteractive
 
@@ -10,6 +10,4 @@ apt update
 
 apt upgrade -y
 
-for PKG in $PKGS ; do
-    apt install -y $PKG
-done
+apt install -y $PKGS
diff --git a/fix-raspian-defaults/root.overlay/boot/per-once.d/99-setup-keys.sh b/fix-raspian-defaults/root.overlay/boot/per-once.d/98-setup-ssh-keys.sh
similarity index 56%
rename from fix-raspian-defaults/root.overlay/boot/per-once.d/99-setup-keys.sh
rename to fix-raspian-defaults/root.overlay/boot/per-once.d/98-setup-ssh-keys.sh
index ac8c3bc..f6eb492 100644
--- a/fix-raspian-defaults/root.overlay/boot/per-once.d/99-setup-keys.sh
+++ b/fix-raspian-defaults/root.overlay/boot/per-once.d/98-setup-ssh-keys.sh
@@ -4,10 +4,18 @@ export DEBIAN_FRONTEND=noninteractive
 apt update && apt install -y curl
 
 KEY_URL="https://sneak.cloud/authorized_keys"
+
+# CAUTION! /!\
+
+# doing only passwd -d <user> means they can log in at the console
+# with no password whatsoever - probably not what you want
+
 curl -fLo /root/.ssh/authorized_keys --create-dirs $KEY_URL && \
-    passwd -d root
+    passwd -d root && \
+    passwd -l root
 
 curl -fLo /home/pi/.ssh/authorized_keys --create-dirs $KEY_URL && \
-    passwd -d pi
+    passwd -d pi && \
+    passwd -l pi
 
 chown -R pi:pi /home/pi/.ssh
diff --git a/fix-raspian-defaults/root.overlay/boot/per-once.d/99-enable-ssh.sh b/fix-raspian-defaults/root.overlay/boot/per-once.d/99-enable-ssh.sh
new file mode 100644
index 0000000..e908cd5
--- /dev/null
+++ b/fix-raspian-defaults/root.overlay/boot/per-once.d/99-enable-ssh.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+systemctl enable ssh
+systemctl start ssh
diff --git a/fix-raspian-defaults/root.overlay/boot/per-once.d/packagelist.txt b/fix-raspian-defaults/root.overlay/boot/per-once.d/packagelist.txt
index 05d3d6c..5f30412 100644
--- a/fix-raspian-defaults/root.overlay/boot/per-once.d/packagelist.txt
+++ b/fix-raspian-defaults/root.overlay/boot/per-once.d/packagelist.txt
@@ -11,7 +11,6 @@ dirmngr
 dnsutils
 gnupg-agent
 gnupg2
-golang-go
 haveged
 inetutils-ping
 iptables-persistent
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 6faab66..bd9dc86 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
@@ -6,7 +6,7 @@ exec 1> >(logger -s -t $(basename $0)) 2>&1
 
 echo "waiting for network to come up..."
 
-while sleep 1; do ping -c1 www.google.com > /dev/null && break; done
+until ping -c1 -w1 www.google.com >/dev/null 2>&1; do :; done
 
 echo "network is now up, running scripts"