Cleanup 3.0.15 (#16)

* 1.9.0-3

* 1.9.0-3

Makefile

@@ -3,8 +3,8 @@
 #
 SRCNAME 	= asl3-pi-appliance
 PKGNAME 	= $(SRCNAME)
-RELVER 		= 1.8.1
-DEBVER 		= 1
+RELVER 		= 1.9.0
+DEBVER 		= 3
 RELPLAT 	?= deb$(shell lsb_release -rs 2> /dev/null)
 
 prefix          ?= /usr

debian/changelog

@@ -1,3 +1,9 @@
+asl3-pi-appliance (1.9.0-3) stable; urgency=medium
+
+  * Unwind some stuff from 3.0.14/.15
+
+ -- Jason McCormick <[email protected]>  Mon, 09 Dec 2024 18:45:35 -0500
+
 asl3-pi-appliance (1.8.1-1) stable; urgency=medium
 
   * Add cockpit-wifimanager 

debian/postinst

@@ -16,6 +16,7 @@
 # the debian-policy package
 #
 set -e
+set -x
 
 if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
     . /usr/share/apache2/apache2-maintscript-helper
@@ -45,10 +46,13 @@ do_configure() {
 		firewall-cmd --zone=allstarlink --permanent --add-service=echolink
 		firewall-cmd --zone=allstarlink --add-service=echolink
 	else
+		set +e
 		firewall-offline-cmd --set-default-zone=allstarlink
 		firewall-offline-cmd --zone=allstarlink --add-service=echolink
 	fi
 
+	set -e
+
 	# Setup avahi-daemon
 	perl -pi -e 's/^publish-workstation=[A-Za-z]+\s?$/publish-workstation=yes\n/' /etc/avahi/avahi-daemon.conf
 	perl -pi -e 's/^publish-hinfo=[A-Za-z]+\s?$/publish-hinfo=yes\n/' /etc/avahi/avahi-daemon.conf
@@ -98,6 +102,26 @@ EOF
 	if [ "${PLATFORM}" == "RaspberryPi" ]; then
 		/usr/bin/asl-enable-pi-serial
 	fi
+
+	# Cleanup /etc/rc.local from 3.0.15
+	if `grep -q POSTROUTING /etc/rc.local > /dev/null 2>&1`; then
+		echo "exit 0" > /etc/rc.local
+	fi
+
+	[ -f /boot/firmware/wifi.nmconnection ] && rm -f /boot/firmware/wifi.nmconnection
+	[ -f /boot/wifi.nmconnection ] && rm -f /boot/wifi.nmconnection
+	[ -f /etc/NetworkManager/system-connections/wifi.nmconnection ] && \
+		rm -f /etc/NetworkManager/system-connections/wifi.nmconnection
+
+	if [ -f /opt/custompios/copy-network-manager-config ]; then
+		rm -f /opt/custompios/copy-network-manager-config
+	fi
+
+	if [ -f /etc/systemd/system/copy-network-manager-config\@.service ]; then
+		deb-systemd-invoke stop [email protected]
+		deb-systemd-invoke disable [email protected]
+		rm -f /etc/systemd/system/copy-network-manager-config\@.service
+	fi
 }
 
 case "$1" in