From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 10148970eb431e8a1a99aaca67c531dc3b6f1492
Date: Thu, 17 Feb 2022 17:10:03 +0000 [thread overview]
Message-ID: <4K01Xq6tb9z2xbm@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2141 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 10148970eb431e8a1a99aaca67c531dc3b6f1492 (commit)
from 1217807d09933ed3760132498360d13d17b98155 (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 10148970eb431e8a1a99aaca67c531dc3b6f1492
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Feb 17 17:07:28 2022 +0000
core164: fix adding additional optionfw settings
the old code erase the settings and cannot reinstalled.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/164/update.sh | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/164/update.sh b/config/rootfiles/core/164/update.sh
index a0650dbda..e6847359c 100644
--- a/config/rootfiles/core/164/update.sh
+++ b/config/rootfiles/core/164/update.sh
@@ -100,9 +100,13 @@ ldconfig
# Run convert script for IDS multiple providers
/usr/sbin/convert-ids-multiple-providers
-# Add missing configuration settings to optionsfw configuration
-echo "DROPHOSTILE=off" > /var/ipfire/optionsfw/settings
-echo "DROPSPOOFEDMARTIAN=on" > /var/ipfire/optionsfw/settings
+# Add configuration settings to optionsfw if they are missing
+if [ "$(grep "^DROPHOSTILE" /var/ipfire/optionsfw/settings)" == "" ]; then
+ echo "DROPHOSTILE=off" >> /var/ipfire/optionsfw/settings
+fi
+if [ "$(grep "^DROPSPOOFEDMARTIAN" /var/ipfire/optionsfw/settings)" == "" ]; then
+ echo "DROPSPOOFEDMARTIAN=on" >> /var/ipfire/optionsfw/settings
+fi
# Apply sysctl changes
/etc/init.d/sysctl start
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2022-02-17 17:10 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=4K01Xq6tb9z2xbm@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