switch base os to raspberry pi os

minor fixes

more robust

build/fstab

@@ -1,4 +1,4 @@
 LABEL=green	/	ext4	discard,errors=remount-ro	0	1
 LABEL=system-boot	/media/boot-rw	vfat	defaults	0	1
-/media/boot-rw	/boot/firmware	none	defaults,bind,ro	0	0
+/media/boot-rw	/boot	none	defaults,bind,ro	0	0
 LABEL=EMBASSY	/embassy-os	vfat	defaults	0	1

build/initialization.service

@@ -1,8 +1,11 @@
 [Unit]
 Description=Boot process for system initialization.
+After=network-online.target systemd-time-wait-sync.service
 
 [Service]
 Type=oneshot
+Restart=on-failure
+RestartSec=5s
 ExecStart=/usr/local/bin/initialization.sh
 RemainAfterExit=true
 

build/initialization.sh

@@ -4,14 +4,12 @@
 set -e
 
 ! test -f /etc/docker/daemon.json || rm /etc/docker/daemon.json
-mount -o remount,rw /boot/firmware
+mount -o remount,rw /boot
+
+curl -fsSL https://get.docker.com | sh # TODO: commit this script into git instead of live fetching it
 
 apt-get update
-apt-get purge -y \
-	bluez \
-	unattended-upgrades
 apt-get install -y \
-	docker.io \
 	tor \
 	nginx \
 	libavahi-client3 \
@@ -19,6 +17,8 @@ apt-get install -y \
 	avahi-utils \
 	iotop \
 	bmon \
+	lvm2 \
+	cryptsetup \
 	exfat-utils \
 	sqlite3 \
 	wireless-tools \
@@ -27,13 +27,9 @@ apt-get install -y \
 	cifs-utils \
 	samba-common-bin \
 	ntp \
-	network-manager \
-	linux-modules-extra-raspi
+	network-manager
 apt-get autoremove -y
 apt-get upgrade -y
-if [[ "$(uname -r)" = "5.13.0-1008-raspi" ]]; then
-	reboot
-fi
 
 sed -i 's/Restart=on-failure/Restart=always/g' /lib/systemd/system/tor@default.service
 sed -i '/}/i \ \ \ \ application\/wasm \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ wasm;' /etc/nginx/mime.types
@@ -62,9 +58,10 @@ ControlPort 9051
 CookieAuthentication 1
 EOF
 
-echo 'overlayroot="tmpfs":swap=1,recurse=0' > /etc/overlayroot.local.conf
+raspi-config nonint enable_overlayfs
 systemctl disable initialization.service
 sudo systemctl restart NetworkManager
 sync
 
-cloud-init clean --reboot
+# TODO: clean out ssh host keys
+reboot

build/make-image.sh

@@ -12,8 +12,13 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 cd $DIR/..
 
 truncate --size=$[(31116287+1)*512] eos.img
-export OUTPUT_DEVICE=$(sudo losetup --show -fP eos.img)
-export LOOPDEV=$(sudo losetup --show -fP ubuntu.img)
+if [ -z "$OUTPUT_DEVICE" ]; then
+  export OUTPUT_DEVICE=$(sudo losetup --show -fP eos.img)
+  export DETACH_OUTPUT_DEVICE=1
+else
+  export DETACH_OUTPUT_DEVICE=0
+fi
+export LOOPDEV=$(sudo losetup --show -fP raspios.img)
 ./build/partitioning.sh
 ./build/write-image.sh
 sudo e2fsck -f ${OUTPUT_DEVICE}p3
@@ -23,4 +28,6 @@ BLOCK_COUNT=$(echo "$BLOCK_INFO" | grep "Block count:" | sed 's/Block count:\s\+
 BLOCK_SIZE=$(echo "$BLOCK_INFO" | grep "Block size:" | sed 's/Block size:\s\+//g')
 echo "YOUR GREEN FILESYSTEM is '$[$BLOCK_COUNT*$BLOCK_SIZE]' BYTES"
 echo "IF YOU ARE QUICK-FLASHING FROM MAC-OS, NOTE THIS NUMBER FOR LATER"
-sudo losetup -d $OUTPUT_DEVICE
+if [ "$DETACH_OUTPUT_DEVICE" -eq "1" ]; then
+  sudo losetup -d $OUTPUT_DEVICE
+fi

build/partitioning.sh

@@ -3,4 +3,4 @@
 set -e
 
 # Use fdisk to create DOS partition table with 4 primary partitions, set 1 as bootable, write, and quite
-(echo o; echo n; echo p; echo 1; echo 2048; echo 526335; echo t; echo c; echo n; echo p; echo 2; echo 526336; echo 1050623; echo t; echo 2; echo c; echo n; echo p; echo 3; echo 1050624; echo 16083455; echo n; echo p; echo 16083456; echo 31116287; echo a; echo 1; echo w) | sudo fdisk ${OUTPUT_DEVICE}
+(echo o; echo x; echo i; echo "0xcb15ae4d"; echo r; echo n; echo p; echo 1; echo 2048; echo 526335; echo t; echo c; echo n; echo p; echo 2; echo 526336; echo 1050623; echo t; echo 2; echo c; echo n; echo p; echo 3; echo 1050624; echo 16083455; echo n; echo p; echo 16083456; echo 31116287; echo a; echo 1; echo w) | sudo fdisk ${OUTPUT_DEVICE}

build/write-image.sh

@@ -27,7 +27,8 @@ else
 	sudo cp build/user-data /tmp/eos-mnt/user-data
 fi
 
-sudo sed -i 's/LABEL=writable/LABEL=green/g' /tmp/eos-mnt/cmdline.txt
+sudo sed -i 's/PARTUUID=cb15ae4d-02/PARTUUID=cb15ae4d-03/g' /tmp/eos-mnt/cmdline.txt
+sudo sed -i 's/ init=\/usr\/lib\/raspi-config\/init_resize.sh//g' /tmp/eos-mnt/cmdline.txt
 # create a copy of the cmdline *without* the quirk string, so that it can be easily amended
 sudo cp /tmp/eos-mnt/cmdline.txt /tmp/eos-mnt/cmdline.txt.orig
 sudo sed -i 's/^/usb-storage.quirks=152d:0562:u /g' /tmp/eos-mnt/cmdline.txt
@@ -35,6 +36,7 @@ sudo sed -i 's/^/usb-storage.quirks=152d:0562:u /g' /tmp/eos-mnt/cmdline.txt
 cat /tmp/eos-mnt/config.txt | grep -v "dtoverlay=" | sudo tee /tmp/eos-mnt/config.txt.tmp
 echo "dtoverlay=pwm-2chan,disable-bt" | sudo tee -a /tmp/eos-mnt/config.txt.tmp
 sudo mv /tmp/eos-mnt/config.txt.tmp /tmp/eos-mnt/config.txt
+sudo touch /tmp/eos-mnt/ssh
 
 # Unmount the boot partition and mount embassy partition
 sudo umount /tmp/eos-mnt
@@ -72,13 +74,13 @@ sudo cp -R frontend/dist/ui /tmp/eos-mnt/var/www/html/main
 sudo mkdir -p /tmp/eos-mnt/root/.ssh
 
 # Custom MOTD
-sudo sed -i 's/ENABLED=1/ENABLED=0/g' /tmp/eos-mnt/etc/default/motd-news
-sudo rm /tmp/eos-mnt/etc/update-motd.d/50-landscape-sysinfo
-sudo cp ./build/00-embassy /tmp/eos-mnt/etc/update-motd.d
-sudo chmod -x /tmp/eos-mnt/etc/update-motd.d/*
-sudo chmod +x /tmp/eos-mnt/etc/update-motd.d/00-embassy
-sudo chmod +x /tmp/eos-mnt/etc/update-motd.d/90-updates-available
-sudo chmod +x /tmp/eos-mnt/etc/update-motd.d/95-hwe-eol
+#sudo sed -i 's/ENABLED=1/ENABLED=0/g' /tmp/eos-mnt/etc/default/motd-news
+#sudo rm /tmp/eos-mnt/etc/update-motd.d/50-landscape-sysinfo
+#sudo cp ./build/00-embassy /tmp/eos-mnt/etc/update-motd.d
+#sudo chmod -x /tmp/eos-mnt/etc/update-motd.d/*
+#sudo chmod +x /tmp/eos-mnt/etc/update-motd.d/00-embassy
+#sudo chmod +x /tmp/eos-mnt/etc/update-motd.d/90-updates-available
+#sudo chmod +x /tmp/eos-mnt/etc/update-motd.d/95-hwe-eol
 
 sudo cp ./build/initialization.sh /tmp/eos-mnt/usr/local/bin