From 61511d3c2c366a33e986769be9079c3fec1e1f2c Mon Sep 17 00:00:00 2001 From: Jason Wallace Date: Wed, 31 Jul 2024 16:18:46 +0200 Subject: [PATCH] Add comments to wireless access point scripts (#1784) Related https://github.com/tiny-pilot/tinypilot/issues/1711 This is a follow-up PR to a [review comment](https://codeapprove.com/pr/tiny-pilot/tinypilot/1778#thread-4d8c230a-afdd-4361-8e21-0a7be15efb06) asking for more code comments in our `enable-wifi-ap` and `disable-wifi-ap` scripts. Review
on CodeApprove --- .../opt/tinypilot-privileged/scripts/disable-wifi-ap | 12 +++++++++--- .../opt/tinypilot-privileged/scripts/enable-wifi-ap | 7 +++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/debian-pkg/opt/tinypilot-privileged/scripts/disable-wifi-ap b/debian-pkg/opt/tinypilot-privileged/scripts/disable-wifi-ap index 69589ca20..8d15f6ba8 100755 --- a/debian-pkg/opt/tinypilot-privileged/scripts/disable-wifi-ap +++ b/debian-pkg/opt/tinypilot-privileged/scripts/disable-wifi-ap @@ -51,18 +51,24 @@ readonly SCRIPT_DIR # shellcheck source=lib/markers.sh . "${SCRIPT_DIR}/lib/markers.sh" +# Clear existing TinyPilot network configurations. "${SCRIPT_DIR}/strip-marker-sections" /etc/dhcpcd.conf -mv \ - /etc/wpa_supplicant/wpa_supplicant.conf.bak \ - /etc/wpa_supplicant/wpa_supplicant.conf +# Restore previously backed up WPA configurations. +if [[ -e /etc/wpa_supplicant/wpa_supplicant.conf.bak ]]; then + mv \ + /etc/wpa_supplicant/wpa_supplicant.conf.bak \ + /etc/wpa_supplicant/wpa_supplicant.conf +fi +# Disable WPA. if [[ -e /etc/wpa_supplicant/wlan_enabled ]]; then rm --force /etc/wpa_supplicant/wlan_enabled else rfkill block wlan fi +# Stop wireless access point. systemctl stop hostapd dnsmasq rm --force \ /etc/hostapd/hostapd.conf \ diff --git a/debian-pkg/opt/tinypilot-privileged/scripts/enable-wifi-ap b/debian-pkg/opt/tinypilot-privileged/scripts/enable-wifi-ap index 9c84840e1..3d06d3a0e 100755 --- a/debian-pkg/opt/tinypilot-privileged/scripts/enable-wifi-ap +++ b/debian-pkg/opt/tinypilot-privileged/scripts/enable-wifi-ap @@ -124,8 +124,10 @@ readonly SCRIPT_DIR # shellcheck source=lib/markers.sh . "${SCRIPT_DIR}/lib/markers.sh" +# Clear existing TinyPilot network configurations. "${SCRIPT_DIR}/strip-marker-sections" /etc/dhcpcd.conf +# Enable wireless network interface. cat <