From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c2df627c8c29d43d1acfbdf60878f6a3339151e1
Date: Tue, 26 Mar 2024 14:43:55 +0000 [thread overview]
Message-ID: <4V3sxl5MCqz2xQk@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2430 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
via c2df627c8c29d43d1acfbdf60878f6a3339151e1 (commit)
from 3d947e6e6b9f492fa0a12b40db0495b6eac6d967 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c2df627c8c29d43d1acfbdf60878f6a3339151e1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 26 14:43:39 2024 +0000
core185: Fix update.sh syntax issues
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/185/update.sh | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
Difference in files:
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"
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2024-03-26 14:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4V3sxl5MCqz2xQk@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox