some Cancel interface fix

1 files changed, 5 insertions, 4 deletions

diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index c2b533afa..00c28ce6f 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -33,6 +33,7 @@ use log;
 use c;
 use network::netconnect;
 use network::shorewall;
+use Data::Dumper;
 
 $::isInstall and die "Not supported during install.\n";
 
@@ -42,7 +43,6 @@ local $_ = join '', @ARGV;
 $::Wizard_pix_up = "wiz_drakgw.png";
 $::direct = /-direct/;
 
-
 my $sysconf_network = "/etc/sysconfig/network";
 my $sysconf_dhcpd = "/etc/sysconfig/dhcpd";
 my $rc_firewall_generic = "/etc/rc.d/rc.firewall";
@@ -53,6 +53,7 @@ my $dhcpd_conf = "/etc/dhcpd.conf";
 my $cups_conf = "/etc/cups/cupsd.conf";
 
 my $shorewall = network::shorewall::read();
+Dumper($shorewall),"\n";
 
 my $in = 'interactive'->vnew('su');
 $::Wizard_title = N("Internet Connection Sharing");
@@ -121,7 +122,7 @@ begin:
 #- **********************************
 #- * 0th step: verify if we are already set up
 
-if ($shorewall && $shorewall->{masquerade}) {
+if ($shorewall && (-f "/etc/shorewall/masq")) {
     $::Wizard_no_previous = 1;
 
     if (!$shorewall->{disabled}) {
@@ -137,7 +138,7 @@ What would you like to do?"),
 		stop_daemons();
 	    }
 	    foreach ($dhcpd_conf, $masq_file) {
-		rename($_, "$_.drakgwdisable") or die "Could not rename $_ to $_.drakgwdisable" 
+		if ( -f $_ ) { rename($_, "$_.drakgwdisable") or die "Could not rename $_ to $_.drakgwdisable"};
 	    }
 	    sys("/etc/init.d/shorewall restart >/dev/null");
 	    log::l("[drakgw] Disabled");
@@ -281,7 +282,7 @@ Do you want an automatic re-configuration?
 You can do it manually but you need to know what you're doing.", $device),
 		  [ { label => N("Automatic reconfiguration"), val => \$auto, list => [ N("Yes"), N("No (experts only)") ] },
 		    { val => N("Show current interface configuration"), clicked =>
-		      sub { $in->ask_warn(N("Current interface configuration"),
+		      sub { $in-> ask_okcancel(N("Current interface configuration"),
 					  N("Current configuration of `%s':
 
 Network: %s