From 9d65d66b36ab727a5db81fec97c5e1e88ddaf630 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Tue, 20 Mar 2012 20:05:36 +0000
Subject: (set_ifw) merge the right patch

---
 lib/network/drakfirewall.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

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");
-- 
cgit v1.2.1