Merge branch 'master' into next

diff --git a/config/rootfiles/oldcore/184/update.sh b/config/rootfiles/oldcore/184/update.sh
index 3bf38ff8b2fd602a8ffaba4b92ac2e46f6ce7988..1a0e67c66399b6e86baf1eabddb91dd5a9d5c41a 100644 (file)
--- a/config/rootfiles/oldcore/184/update.sh
+++ b/config/rootfiles/oldcore/184/update.sh
@@ -73,9 +73,19 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# fix module compression of rtl8812au
+xz -d /lib/modules/6.6.15-ipfire/extra/wlan/8812au.ko.xz
+xz --check=crc32 --lzma2=dict=512KiB /lib/modules/6.6.15-ipfire/extra/wlan/8812au.ko
+
 # Apply local configuration to sshd_config
 /usr/local/bin/sshctrl
 
+# Add the drop hostile in and out logging options
+# into the optionsfw settings file and apply to firewall
+sed -i '$ a\LOGDROPHOSTILEIN=on' /var/ipfire/optionsfw/settings
+sed -i '$ a\LOGDROPHOSTILEOUT=on' /var/ipfire/optionsfw/settings
+/usr/local/bin/firewallctrl
+
 # Start services
 telinit u
 /etc/init.d/vnstat start