diff options
| author | Pavel Moravec <pmoravec@redhat.com> | 2017-09-06 16:09:54 +0200 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2017-10-27 14:26:06 +0100 |
| commit | c48fb67afa63d96c531bb390b859154ebf414fbe (patch) | |
| tree | a5f3e72a28f4049d91252846d709aee1fe773f32 | |
| parent | e97bf7bc7e0ffe8c96429843f46f9c0436c34c95 (diff) | |
| download | sos-c48fb67afa63d96c531bb390b859154ebf414fbe.tar.gz | |
[networking] call iptables -L only when iptable_filter module is loaded
If iptables_filter kernel module isn't loaded, dont call
"iptables -vnxL" that would load that plugin.
The same applies to ip6tables as well.
Resolves: #1095
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
| -rw-r--r-- | sos/plugins/networking.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py index bb930ad7..53f85ad4 100644 --- a/sos/plugins/networking.py +++ b/sos/plugins/networking.py @@ -191,10 +191,16 @@ class Networking(Plugin): "biosdevname -d", "tc -s qdisc show", "ip -s macsec show", - "iptables -vnxL", - "ip6tables -vnxL" ]) + # When iptables is called it will load the modules + # iptables and iptables_filter if they are not loaded. + # The same goes for ipv6. + if self.check_ext_prog("grep -q iptable_filter /proc/modules"): + self.add_cmd_output("iptables -vnxL") + if self.check_ext_prog("grep -q ip6table_filter /proc/modules"): + self.add_cmd_output("ip6tables -vnxL") + # There are some incompatible changes in nmcli since # the release of NetworkManager >= 0.9.9. In addition, # NetworkManager >= 0.9.9 will use the long names of |