[netcf-devel] [PATCH] remove unused data file and make rule adding it to packages

[Laine Stump]

Way back in 2010, commit 210b78b3 removed code that would add this
rule to iptables:

-I FORWARD -m physdev --physdev-is-bridged -j ACCEPT

but for some reason I neglected to remove the data file, which was
still being put into packages and installed to every system. This
patch fixes that omission.
---
Makefile.am | 1 -
data/iptables-forward-bridged | 1 -
tests/redhat/fsroot/etc/sysconfig/system-config-firewall | 5 -----
3 files changed, 7 deletions(-)
delete mode 100644 data/iptables-forward-bridged
delete mode 100644 tests/redhat/fsroot/etc/sysconfig/system-config-firewall

diff --git a/Makefile.am b/Makefile.am
index d380ec8..ed6de65 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,6 @@ dist_xml_DATA=data/xml/augeas.rng data/xml/interface.rng \
data/xml/debian-get.xsl data/xml/debian-put.xsl \
data/xml/redhat-get.xsl data/xml/redhat-put.xsl \
data/xml/suse-get.xsl data/xml/suse-put.xsl
-dist_netcf_DATA=data/iptables-forward-bridged
dist_lens_DATA= \
data/lenses/netcf.aug \
data/lenses/persist_net_rules.aug \
diff --git a/data/iptables-forward-bridged b/data/iptables-forward-bridged
deleted file mode 100644
index 133e87b..0000000
--- a/data/iptables-forward-bridged
+++ /dev/null
@@ -1 +0,0 @@
--I FORWARD -m physdev --physdev-is-bridged -j ACCEPT
diff --git a/tests/redhat/fsroot/etc/sysconfig/system-config-firewall b/tests/redhat/fsroot/etc/sysconfig/system-config-firewall
deleted file mode 100644
index 0ea3c39..0000000
--- a/tests/redhat/fsroot/etc/sysconfig/system-config-firewall
+++ /dev/null
@@ -1,5 +0,0 @@
-# Configuration file for system-config-firewall
-
---enabled
---service=ssh
---custom-rules=ipv4:filter:/data/share/share/netcf/iptables-forward-bridged

[Eric Blake]

Post by Laine Stump
Way back in 2010, commit 210b78b3 removed code that would add this
-I FORWARD -m physdev --physdev-is-bridged -j ACCEPT
but for some reason I neglected to remove the data file, which was
still being put into packages and installed to every system. This
patch fixes that omission.
---
Makefile.am | 1 -
data/iptables-forward-bridged | 1 -
tests/redhat/fsroot/etc/sysconfig/system-config-firewall | 5 -----
3 files changed, 7 deletions(-)
delete mode 100644 data/iptables-forward-bridged
delete mode 100644 tests/redhat/fsroot/etc/sysconfig/system-config-firewall

ACK.