summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@chromium.org>2021-02-09 10:40:13 -0500
committerMike Frysinger <vapier@gentoo.org>2021-02-09 10:58:04 -0500
commit13ebe1e91aa41530b5c241dc52b411dbae8f66c8 (patch)
treef1e2ff1661d4242036475748334cd5a2fdbb586f /net-firewall/ebtables
parentnet-firewall/ebtables: fix path to /etc/ethertypes #765679 (diff)
downloadgentoo-13ebe1e91aa41530b5c241dc52b411dbae8f66c8.tar.gz
gentoo-13ebe1e91aa41530b5c241dc52b411dbae8f66c8.tar.bz2
gentoo-13ebe1e91aa41530b5c241dc52b411dbae8f66c8.zip
net-firewall/ebtables: make logger usage optional #514970
Use the same pattern adopted in iptables init scripts to make the use of the logger init service optional. This avoids circular deps if the logger service requires the network, and shouldn't be a big deal as most people probably aren't logging packets. Fixes: https://bugs.gentoo.org/514970 Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'net-firewall/ebtables')
-rw-r--r--net-firewall/ebtables/files/ebtables.confd-r18
-rw-r--r--net-firewall/ebtables/files/ebtables.initd-r13
2 files changed, 9 insertions, 2 deletions
diff --git a/net-firewall/ebtables/files/ebtables.confd-r1 b/net-firewall/ebtables/files/ebtables.confd-r1
index 645b26edae9..8e83c81b9f8 100644
--- a/net-firewall/ebtables/files/ebtables.confd-r1
+++ b/net-firewall/ebtables/files/ebtables.confd-r1
@@ -9,3 +9,11 @@ SAVE_RESTORE_OPTIONS=""
# Save state on stopping ebtables
SAVE_ON_STOP="yes"
+
+# If you need to log iptables messages as soon as iptables starts,
+# AND your logger does NOT depend on the network, then you may wish
+# to uncomment the next line.
+# If your logger depends on the network, and you uncomment this line
+# you will create an unresolvable circular dependency during startup.
+# After commenting or uncommenting this line, you must run 'rc-update -u'.
+#rc_use="logger"
diff --git a/net-firewall/ebtables/files/ebtables.initd-r1 b/net-firewall/ebtables/files/ebtables.initd-r1
index 6608760110b..1860187b7de 100644
--- a/net-firewall/ebtables/files/ebtables.initd-r1
+++ b/net-firewall/ebtables/files/ebtables.initd-r1
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
extra_commands="save panic"
@@ -10,7 +10,6 @@ ebtables_save=${EBTABLES_SAVE}
depend() {
before net
- use logger
}
ebtables_tables() {