From c2df627c8c29d43d1acfbdf60878f6a3339151e1 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 26 Mar 2024 14:43:39 +0000 Subject: [PATCH] core185: Fix update.sh syntax issues Signed-off-by: Michael Tremer --- config/rootfiles/core/185/update.sh | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/config/rootfiles/core/185/update.sh b/config/rootfiles/core/185/update.sh index 002f92bbb..f86013c0d 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" -- 2.39.5