Sophie

Sophie

distrib > Mandriva > 2011.0 > i586 > media > main-updates-src > by-pkgid > ae7ec5dc525e3b59a482cb1eb97a5c0e > files > 1

drakx-net-0.93-7.3.src.rpm

--- drakx-net-0.93/bin/drakgw.fwdisable	2009-04-02 20:33:02.000000000 +0400
+++ drakx-net-0.93/bin/drakgw	2011-09-21 16:51:27.000000000 +0400
@@ -79,7 +79,10 @@ Make sure you have configured your Netwo
 
 Note: you need a dedicated Network Adapter to set up a Local Area Network (LAN). Please disable Mandriva Firewall for the network adapter connected to your LAN connection before proceeding."),
 	      post => sub {
-		  $gw_enabled = !$shorewall->{disabled} && grep { !/^#/ } cat_($masq_file);
+		  # see #63998
+		  # do not start configuration if shorewall disabled
+		  if ($shorewall->{disabled}) {return "end_fw_disabled";}
+		  $gw_enabled = grep { !/^#/ } cat_($masq_file);
 		  return $gw_enabled ? "ask_reconfigure" : "choose_net_interface";
 	      },
 	     },
@@ -323,6 +326,12 @@ Please run the hardware configuration to
 	      end => 1,
 	     },
 
+	     end_fw_disabled =>
+	     {
+	      name => N("Firewall is disabled. Please enable firewall before configure Internet Connection Sharing."),
+	      end => 1,
+	     },
+
 	     end =>
 	     {
 	      name => N("Everything has been configured.