diff options
| author | Florin Grad <florin@mandriva.com> | 2002-09-20 15:37:21 +0000 |
|---|---|---|
| committer | Florin Grad <florin@mandriva.com> | 2002-09-20 15:37:21 +0000 |
| commit | a94bd01e916573a880810587a5261dc6836e6be4 (patch) | |
| tree | 4f468491fabc41b5b70f766d21c6f8472054a30a /perl-install/standalone | |
| parent | e0ef912e08c09e58ced240308e96e12c7ec51dd4 (diff) | |
| download | drakx-backup-do-not-use-a94bd01e916573a880810587a5261dc6836e6be4.tar drakx-backup-do-not-use-a94bd01e916573a880810587a5261dc6836e6be4.tar.gz drakx-backup-do-not-use-a94bd01e916573a880810587a5261dc6836e6be4.tar.bz2 drakx-backup-do-not-use-a94bd01e916573a880810587a5261dc6836e6be4.tar.xz drakx-backup-do-not-use-a94bd01e916573a880810587a5261dc6836e6be4.zip | |
fix the disable function
Diffstat (limited to 'perl-install/standalone')
| -rwxr-xr-x | perl-install/standalone/drakgw | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index ff7b7c337..6cd4ecc62 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -49,6 +49,7 @@ my $sysconf_dhcpd = "/etc/sysconfig/dhcpd"; my $rc_firewall_generic = "/etc/rc.d/rc.firewall"; my $rc_firewall_drakgw = "/etc/rc.d/rc.firewall.inet_sharing"; my $rc_firewall_24 = "/etc/rc.d/rc.firewall.inet_sharing-2.4"; +my $masq_file = "/etc/shorewall/masq"; my $dhcpd_conf = "/etc/dhcpd.conf"; my $cups_conf = "/etc/cups/cupsd.conf"; @@ -134,9 +135,10 @@ What would you like to do?"), my $wait_disabl = $in->wait_message('', _("Disabling servers...")); stop_daemons(); } - foreach ($dhcpd_conf, $rc_firewall_24) { + foreach ($dhcpd_conf, $masq_file) { renamef($_, "$_.drakgwdisable") or die "Could not rename $_ to $_.drakgwdisable" } + sys("/etc/init.d/shorewall restart >/dev/null"); log::l("[drakgw] Disabled"); $::Wizard_finished = 1; $in->ask_okcancel('', _("Internet connection sharing is now disabled.")); @@ -155,7 +157,7 @@ It's currently disabled. What would you like to do?"), [ __("enable"), __("reconfigure"), __("dismiss") ]); if ($r eq "enable") { - foreach ($dhcpd_conf, $rc_firewall_24) { + foreach ($dhcpd_conf, $masq_file) { rename($_, "$_.old") if -f $_; rename("$_.drakgwdisable", $_) or die "Could not find configuration. Please reconfigure."; } @@ -287,7 +289,7 @@ Driver: %s", $device, $conf->{NETWORK}, $conf->{IPADDR}, $conf->{BOOTPROTO}, $al _("I can keep your current configuration and assume you already set up a DHCP server; in that case please verify I correctly read the Network that you use for your local network; I will not reconfigure it and I will not touch your DHCP server configuration. The default DNS entry is the Caching Nameserver configured on the firewall. You can replace that with your ISP DNS IP, for example. - + Else, I can reconfigure your interface and (re)configure a DHCP server for you. ", $device), |