| 1 |
commit: 13ebe1e91aa41530b5c241dc52b411dbae8f66c8 |
| 2 |
Author: Mike Frysinger <vapier <AT> chromium <DOT> org> |
| 3 |
AuthorDate: Tue Feb 9 15:40:13 2021 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 9 15:58:04 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ebe1e9 |
| 7 |
|
| 8 |
net-firewall/ebtables: make logger usage optional #514970 |
| 9 |
|
| 10 |
Use the same pattern adopted in iptables init scripts to make the |
| 11 |
use of the logger init service optional. This avoids circular deps |
| 12 |
if the logger service requires the network, and shouldn't be a big |
| 13 |
deal as most people probably aren't logging packets. |
| 14 |
|
| 15 |
Fixes: https://bugs.gentoo.org/514970 |
| 16 |
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> |
| 17 |
|
| 18 |
net-firewall/ebtables/files/ebtables.confd-r1 | 8 ++++++++ |
| 19 |
net-firewall/ebtables/files/ebtables.initd-r1 | 3 +-- |
| 20 |
2 files changed, 9 insertions(+), 2 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net-firewall/ebtables/files/ebtables.confd-r1 b/net-firewall/ebtables/files/ebtables.confd-r1 |
| 23 |
index 645b26edae9..8e83c81b9f8 100644 |
| 24 |
--- a/net-firewall/ebtables/files/ebtables.confd-r1 |
| 25 |
+++ b/net-firewall/ebtables/files/ebtables.confd-r1 |
| 26 |
@@ -9,3 +9,11 @@ SAVE_RESTORE_OPTIONS="" |
| 27 |
|
| 28 |
# Save state on stopping ebtables |
| 29 |
SAVE_ON_STOP="yes" |
| 30 |
+ |
| 31 |
+# If you need to log iptables messages as soon as iptables starts, |
| 32 |
+# AND your logger does NOT depend on the network, then you may wish |
| 33 |
+# to uncomment the next line. |
| 34 |
+# If your logger depends on the network, and you uncomment this line |
| 35 |
+# you will create an unresolvable circular dependency during startup. |
| 36 |
+# After commenting or uncommenting this line, you must run 'rc-update -u'. |
| 37 |
+#rc_use="logger" |
| 38 |
|
| 39 |
diff --git a/net-firewall/ebtables/files/ebtables.initd-r1 b/net-firewall/ebtables/files/ebtables.initd-r1 |
| 40 |
index 6608760110b..1860187b7de 100644 |
| 41 |
--- a/net-firewall/ebtables/files/ebtables.initd-r1 |
| 42 |
+++ b/net-firewall/ebtables/files/ebtables.initd-r1 |
| 43 |
@@ -1,5 +1,5 @@ |
| 44 |
#!/sbin/openrc-run |
| 45 |
-# Copyright 1999-2020 Gentoo Authors |
| 46 |
+# Copyright 1999-2021 Gentoo Authors |
| 47 |
# Distributed under the terms of the GNU General Public License v2 |
| 48 |
|
| 49 |
extra_commands="save panic" |
| 50 |
@@ -10,7 +10,6 @@ ebtables_save=${EBTABLES_SAVE} |
| 51 |
|
| 52 |
depend() { |
| 53 |
before net |
| 54 |
- use logger |
| 55 |
} |
| 56 |
|
| 57 |
ebtables_tables() { |
Archives