wifi fix

2024-03-15-raspios-bookworm-arm64-lite.img.xz.sha256

@@ -0,0 +1 @@
+58a3ec57402c86332e67789a6b8f149aeeb4e7bb0a16c9388a66ea6e07012e45  2024-03-15-raspios-bookworm-arm64-lite.img.xz

README.md

@@ -3,6 +3,7 @@ N-AnotterKiosk (Not-AnotterKiosk)
 
 ### I have hacked this about alot from the main branch, mainly Raspberry Pi changes
 
+- Removed x86 support
 - Added scheduled screen on/off
 - Added scheduled chrome page refresh
 - Rpi3 Overclock settings

build_raspberry_pi.sh

@@ -15,13 +15,16 @@ sudo mkdir -p "${BUILD_DIR}"
 # download a modern RaspiOS build
 if [ ! -f raspios.img.xz ]
 then
-	wget -O raspios.img.xz "https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2023-05-03/2023-05-03-raspios-bullseye-arm64-lite.img.xz"
+	wget -O raspios.img.xz "https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2024-03-15/2024-03-15-raspios-bookworm-arm64-lite.img.xz"
-	echo "bf982e56b0374712d93e185780d121e3f5c3d5e33052a95f72f9aed468d58fa7 raspios.img.xz" | sha256sum --check --status
+	wget -O raspios.img.xz.sha256 "https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2024-03-15/2024-03-15-raspios-bookworm-arm64-lite.img.xz.sha256"
+	sed -i 's/2024-03-15-raspios-bookworm-arm64-lite.img.xz/raspios.img.xz/g' raspios.img.xz.sha256
+	sha256sum --check --status raspios.img.xz.sha256
 	if [ $? -ne 0 ]
 	then
 	    echo "downloaded raspios does not match checksum";
-	    return -1;
+	    exit -1;
 	fi
+	rm raspios.img.xz.sha256
 fi
 
 rm -f raspios.img
@@ -43,8 +46,11 @@ sudo mount /dev/loop0p2 "${BUILD_DIR}"
 sudo mount /dev/loop0p1 "${BUILD_DIR}/boot"
 
 # Copy the (raspberry pi-specific) skeleton files
-sudo rsync -a "${SCRIPT_DIR}/raspberry_pi_skeleton/." "${BUILD_DIR}"
+sudo rsync -rl --exclude ".DS_Store" --exclude "boot" "${SCRIPT_DIR}/raspberry_pi_skeleton/." "${BUILD_DIR}"
-sudo rsync -a "${SCRIPT_DIR}/kiosk_skeleton/." "${BUILD_DIR}/kiosk_skeleton"
+sudo rsync -rl --exclude ".DS_Store" "${SCRIPT_DIR}/kiosk_skeleton/." "${BUILD_DIR}/kiosk_skeleton"
+sudo cp "${SCRIPT_DIR}/raspberry_pi_skeleton/boot/config.txt" "${BUILD_DIR}/boot/config.txt"
+sudo cp "${SCRIPT_DIR}/raspberry_pi_skeleton/boot/ssh" "${BUILD_DIR}/boot/ssh"
+sudo sed -i '$ s/$/ logo.nologo consoleblank=0 loglevel=0 quiet/' "${BUILD_DIR}/boot/cmdline.txt"
 
 # Make fstab read-only
 sed -i 's/vfat    defaults/vfat    ro,defaults/g' "${BUILD_DIR}/etc/fstab"
@@ -59,14 +65,10 @@ sudo mount proc -t proc -o nosuid,noexec,nodev "${BUILD_DIR}/proc/"
 sudo mount sys -t sysfs -o nosuid,noexec,nodev,ro "${BUILD_DIR}/sys/"
 sudo mount devpts -t devtmpfs -o mode=0755,nosuid "${BUILD_DIR}/dev/"
 
-# Raspbian currently ships only Debian 11. Let's upgrade to 12.
-sudo chroot "${BUILD_DIR}" /raspberry_pi_bullseye.sh
-
 # and then actually install everything.
 sudo chroot "${BUILD_DIR}" /kiosk_skeleton/build.sh
 
 sudo rm -r "${BUILD_DIR}/kiosk_skeleton"
-sudo rm "${BUILD_DIR}/raspberry_pi_bullseye.sh"
 
 cp "${BUILD_DIR}/version-info" version-info
 

kiosk_skeleton/build.sh

@@ -2,7 +2,6 @@
 # This script is being run on the target debian platform
 
 apt update
-APT_LISTCHANGES_FRONTEND=none DEBIAN_FRONTEND=noninteractive apt dist-upgrade -y
 DEBIAN_FRONTEND=noninteractive apt install -y lightdm openbox nginx php-fpm php-cli chromium autossh unclutter x11-xserver-utils xdotool htop nano openssh-server rsync x11vnc lm-sensors ntpdate scrot wireless-regdb fontconfig
 
 rsync -a --chown=root:root "/kiosk_skeleton/." "/"
@@ -70,6 +69,7 @@ systemctl disable avahi-daemon || true
 systemctl disable bluetooth || true
 
 systemctl enable kiosk-ssh-keys
+systemctl enable NetworkManager
 systemctl enable kiosk-wifi
 systemctl enable kiosk-autossh
 systemctl enable kiosk-watchdog
@@ -92,10 +92,15 @@ apt install -y hyperion
 # Run Hyperion as the 'pi' user
 mkdir -p /etc/systemd/system/hyperiond.service.d
 echo -e "[Service]\nUser=pi\nGroup=pi" > /etc/systemd/system/hyperiond.service.d/override.conf
-chown -R pi:pi /var/lib/hyperion || true
+mkdir -p /var/lib/hyperion
+mkdir -p /etc/hyperion
+chown -R pi:pi /var/lib/hyperion
 chown -R pi:pi /etc/hyperion
 usermod -a -G video pi
 
+# clean up apt cache to reduce image size
+apt clean
+
 # generate a version info/build info file
 echo -n "Chromium version: " >> /version-info
 dpkg --list | grep "ii  chromium " >> /version-info

kiosk_skeleton/etc/systemd/system/kiosk-wifi.service

@@ -1,6 +1,7 @@
 [Unit]
-Description=Generate wpa_supplicant.conf from kioskbrowser.ini
+Description=Configure WiFi from kioskbrowser.ini
-Before=wpa_supplicant.service dhcpcd.service
+Requires=NetworkManager.service
+After=NetworkManager.service
 
 [Service]
 Type=oneshot

kiosk_skeleton/usr/bin/kiosk-wifi

@@ -1,27 +1,15 @@
 #!/bin/bash
 
-if [ -f "/boot/wpa_supplicant.conf" ]; then
-	ln -s /boot/wpa_supplicant.conf /tmp/wpa_supplicant.conf
-	exit
-fi
-
 WIFI_SSID=$(get-ini /boot/kioskbrowser.ini wifi ssid)
 WIFI_PSK=$(get-ini /boot/kioskbrowser.ini wifi psk)
 WIFI_COUNTRY=$(get-ini /boot/kioskbrowser.ini wifi country)
 
-if [ -n "${WIFI_SSID}" ]
+if [ -n "${WIFI_COUNTRY}" ]
 then
-	echo "country=${WIFI_COUNTRY}" > /tmp/wpa_supplicant.conf
+    nmcli general reload conf-only
-	echo "ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev" >> /tmp/wpa_supplicant.conf
-	echo "update_config=1" >> /tmp/wpa_supplicant.conf
-	echo "network={" >> /tmp/wpa_supplicant.conf
-	echo "	ssid=\"${WIFI_SSID}\"" >> /tmp/wpa_supplicant.conf
-	if [ -n "${WIFI_PSK}" ]
-	then
-		echo "	psk=\"${WIFI_PSK}\"" >> /tmp/wpa_supplicant.conf
-	else
-		echo "	key_mgmt=NONE" >> /tmp/wpa_supplicant.conf
-	fi
-	echo "}" >> /tmp/wpa_supplicant.conf
 fi
 
+if [ -n "${WIFI_SSID}" ]
+then
+    nmcli device wifi connect "${WIFI_SSID}" password "${WIFI_PSK}" || true
+fi

raspberry_pi_skeleton/raspberry_pi_bullseye.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-echo > /etc/apt/sources.list
-echo "deb http://deb.debian.org/debian bookworm main contrib non-free" >> /etc/apt/sources.list
-echo "deb http://security.debian.org/debian-security bookworm-security main contrib non-free" >> /etc/apt/sources.list
-echo "deb http://deb.debian.org/debian bookworm-updates main contrib non-free" >> /etc/apt/sources.list
-
-apt update
-APT_LISTCHANGES_FRONTEND=none DEBIAN_FRONTEND=noninteractive apt -o Dpkg::Options::="--force-confold" -f -y dist-upgrade
-
-# This step is a bit risky, as the current kernel in https://github.com/raspberrypi/rpi-firmware might
-# be less tested as the currently shipping kernel in the Raspberry Pi images.
-apt install -y rpi-update
-SKIP_CHECK_PARTITION=1 SKIP_WARNING=1 rpi-update