From 466668553d2f99961eb271ccc2153c572db4bc70 Mon Sep 17 00:00:00 2001
From: Karl <karl@k-world.me.uk>
Date: Tue, 22 Jul 2025 11:44:26 +0100
Subject: [PATCH] potental correct wifi fix

---
 kiosk_skeleton/build.sh                       |  5 +-
 .../system-connections/kiosk.nmconnection     | 21 ++++++++
 .../etc/systemd/system/kiosk-wifi.service     | 10 ----
 kiosk_skeleton/usr/bin/get-ini                | 22 --------
 kiosk_skeleton/usr/bin/kiosk-wifi             | 50 -------------------
 5 files changed, 23 insertions(+), 85 deletions(-)
 create mode 100644 kiosk_skeleton/etc/NetworkManager/system-connections/kiosk.nmconnection
 delete mode 100644 kiosk_skeleton/etc/systemd/system/kiosk-wifi.service
 delete mode 100755 kiosk_skeleton/usr/bin/get-ini
 delete mode 100755 kiosk_skeleton/usr/bin/kiosk-wifi

diff --git a/kiosk_skeleton/build.sh b/kiosk_skeleton/build.sh
index f8b4b4c..1d1d05c 100755
--- a/kiosk_skeleton/build.sh
+++ b/kiosk_skeleton/build.sh
@@ -2,7 +2,7 @@
 # This script is being run on the target debian platform
 
 apt update
-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 php-cli uuid-runtime
+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 php-cli
 
 rsync -a --chown=root:root "/kiosk_skeleton/." "/"
 chmod +x /usr/bin/kiosk-* /usr/bin/get-ini /usr/bin/refresh-screen /usr/bin/schedule-* /usr/bin/setup-refresh-timer
@@ -60,8 +60,6 @@ mkdir -p /etc/wpa_supplicant/
 ln -sf /tmp/hosts /etc/hosts
 ln -sf /tmp/hostname /etc/hostname
 ln -sf /tmp/wpa_supplicant.conf /etc/wpa_supplicant/wpa_supplicant.conf
-mkdir -p /etc/NetworkManager/system-connections/
-ln -sf /tmp/kiosk.nmconnection /etc/NetworkManager/system-connections/kiosk.nmconnection
 
 systemctl daemon-reload
 
@@ -73,6 +71,7 @@ systemctl disable bluetooth || true
 
 systemctl enable kiosk-ssh-keys
 systemctl enable NetworkManager
+systemctl enable NetworkManager
 systemctl enable kiosk-wifi
 systemctl enable kiosk-autossh
 systemctl enable kiosk-watchdog
diff --git a/kiosk_skeleton/etc/NetworkManager/system-connections/kiosk.nmconnection b/kiosk_skeleton/etc/NetworkManager/system-connections/kiosk.nmconnection
new file mode 100644
index 0000000..812ce5e
--- /dev/null
+++ b/kiosk_skeleton/etc/NetworkManager/system-connections/kiosk.nmconnection
@@ -0,0 +1,21 @@
+[connection]
+id=kiosk
+uuid=a2a5c7d8-2e2b-4b2a-9c1d-3e4e5e6a7b8c
+type=wifi
+autoconnect=true
+interface-name=wlan0
+
+[wifi]
+mode=infrastructure
+ssid=YOUR_WIFI_SSID
+
+[wifi-security]
+auth-alg=open
+key-mgmt=wpa-psk
+psk=YOUR_WIFI_PASSWORD
+
+[ipv4]
+method=auto
+
+[ipv6]
+method=auto
\ No newline at end of file
diff --git a/kiosk_skeleton/etc/systemd/system/kiosk-wifi.service b/kiosk_skeleton/etc/systemd/system/kiosk-wifi.service
deleted file mode 100644
index 7367147..0000000
--- a/kiosk_skeleton/etc/systemd/system/kiosk-wifi.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Generate NetworkManager connection profile from kioskbrowser.ini
-Before=NetworkManager.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/kiosk-wifi
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
diff --git a/kiosk_skeleton/usr/bin/get-ini b/kiosk_skeleton/usr/bin/get-ini
deleted file mode 100755
index 9a9d17d..0000000
--- a/kiosk_skeleton/usr/bin/get-ini
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env php
-<?php
-if ($argc != 4 && $argc != 5)
-{
-	error_log("Usage: get-ini FILE SECTION NAME [DEFAULT]");
-	error_log("Fetches a single configuration item from an ini file");
-	exit(1);
-}
-
-$config = parse_ini_file($argv[1], true, INI_SCANNER_NORMAL);
-
-if (isset($config[$argv[2]]))
-{
-	if (isset($config[$argv[2]][$argv[3]]))
-	{
-		echo $config[$argv[2]][$argv[3]];
-		exit(0);
-	}
-}
-
-echo $argv[4] ?? "";
-exit(1);
\ No newline at end of file
diff --git a/kiosk_skeleton/usr/bin/kiosk-wifi b/kiosk_skeleton/usr/bin/kiosk-wifi
deleted file mode 100755
index 3bf0c55..0000000
--- a/kiosk_skeleton/usr/bin/kiosk-wifi
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-set -e
-
-echo "Generating NetworkManager connection profile..."
-
-WIFI_SSID=$(get-ini /boot/kioskbrowser.ini wifi ssid)
-WIFI_PSK=$(get-ini /boot/kioskbrowser.ini wifi psk)
-
-if [ -z "${WIFI_SSID}" ]; then
-    echo "No WiFi SSID configured. Exiting."
-    exit 0
-fi
-
-# The profile will be written to /tmp and symlinked from /etc
-PROFILE_NAME="kiosk"
-PROFILE_PATH="/tmp/${PROFILE_NAME}.nmconnection"
-
-# Generate a UUID for the connection
-UUID=$(uuidgen)
-
-# Create the NetworkManager connection file
-cat > "${PROFILE_PATH}" << EOF
-[connection]
-id=${PROFILE_NAME}
-uuid=${UUID}
-type=wifi
-interface-name=wlan0
-autoconnect=true
-
-[wifi]
-mode=infrastructure
-ssid=${WIFI_SSID}
-
-[wifi-security]
-auth-alg=open
-key-mgmt=wpa-psk
-psk=${WIFI_PSK}
-
-[ipv4]
-method=auto
-
-[ipv6]
-method=auto
-EOF
-
-# Set the correct permissions
-chmod 600 "${PROFILE_PATH}"
-chown root:root "${PROFILE_PATH}"
-
-echo "Successfully created connection profile at ${PROFILE_PATH}."