From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 26 Mar 2024 14:43:39 +0000 (+0000)
Subject: core185: Fix update.sh syntax issues
X-Git-Tag: v2.29-core185~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2df627c8c29d43d1acfbdf60878f6a3339151e1;p=ipfire-2.x.git

core185: Fix update.sh syntax issues

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/185/update.sh b/config/rootfiles/core/185/update.sh
index 002f92bbbc..f86013c0d4 100644
--- a/config/rootfiles/core/185/update.sh
+++ b/config/rootfiles/core/185/update.sh
@@ -117,19 +117,17 @@ chown nobody:nobody /var/ipfire/ovpn/ovpnconfig
 
 # Check if the drop hostile in and out logging options need to be added
 # into the optionsfw settings file and apply to firewall
-optionsfw=""
-if ! [ $(grep "^LOGDROPHOSTILEIN=" /var/ipfire/optionsfw/settings) ]; then
-    sed -i '$ a\LOGDROPHOSTILEIN=on' /var/ipfire/optionsfw/settings
-    optionsfw="updated"
+if ! grep -q "^LOGDROPHOSTILEIN=" /var/ipfire/optionsfw/settings; then
+	echo "LOGDROPHOSTILEIN=on" >> /var/ipfire/optionsfw/settings
 fi
-if ! [ $(grep "^LOGDROPHOSTILEOUT=" /var/ipfire/optionsfw/settings) ]; then
-    sed -i '$ a\LOGDROPHOSTILEOUT=on' /var/ipfire/optionsfw/settings
-    optionsfw="updated"
-fi
-if ! [ -z "$optionsfw" ]; then
-    /usr/local/bin/firewallctrl
+
+if ! grep -q "^LOGDROPHOSTILEOUT=" /var/ipfire/optionsfw/settings; then
+	echo "LOGDROPHOSTILEOUT=on" >> /var/ipfire/optionsfw/settings
 fi
 
+# Reload all firewall rules
+/usr/local/bin/firewallctrl
+
 # Rebuild initial ramdisks
 dracut --regenerate-all --force
 KVER="xxxKVERxxx"