diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-03-20 20:05:36 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-03-20 20:05:36 +0000 |
| commit | 9d65d66b36ab727a5db81fec97c5e1e88ddaf630 (patch) | |
| tree | 04581b53d0cff19419ce91eae1c7d40163f31e1a | |
| parent | d294ef80722f726700246cfce288339e9625dbaa (diff) | |
| download | drakx-net-9d65d66b36ab727a5db81fec97c5e1e88ddaf630.tar drakx-net-9d65d66b36ab727a5db81fec97c5e1e88ddaf630.tar.gz drakx-net-9d65d66b36ab727a5db81fec97c5e1e88ddaf630.tar.bz2 drakx-net-9d65d66b36ab727a5db81fec97c5e1e88ddaf630.tar.xz drakx-net-9d65d66b36ab727a5db81fec97c5e1e88ddaf630.zip | |
(set_ifw) merge the right patch
| -rw-r--r-- | lib/network/drakfirewall.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/network/drakfirewall.pm b/lib/network/drakfirewall.pm index 4a18a04..ff87724 100644 --- a/lib/network/drakfirewall.pm +++ b/lib/network/drakfirewall.pm @@ -291,7 +291,7 @@ sub set_ifw { } substInFile { - undef $_ if member($_, "INCLUDE /etc/ifw/rules", "iptables -I INPUT 2 -j Ifw"); + undef $_ if m!^INCLUDE /etc/ifw/rules|^iptables -I INPUT 2 -j Ifw!; } "$::prefix/etc/shorewall/start"; network::shorewall::set_in_file('start', $enabled, "INCLUDE /etc/ifw/start", "INCLUDE /etc/ifw/rules", "iptables -I INPUT 1 -j Ifw"); network::shorewall::set_in_file('stop', $enabled, "iptables -D INPUT -j Ifw", "INCLUDE /etc/ifw/stop"); |