summaryrefslogtreecommitdiffstats
path: root/perl-install/network
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2002-01-09 19:55:21 +0000
committerdamien <damien@mandriva.com>2002-01-09 19:55:21 +0000
commit26f364d6608223588dfcc70e12d6a42c27db11a3 (patch)
tree85360082145755feae4accf6e677bc028fefce92 /perl-install/network
parent03d8c4da420bab98dfe07f0afcaada03bfecf848 (diff)
downloaddrakx-26f364d6608223588dfcc70e12d6a42c27db11a3.tar
drakx-26f364d6608223588dfcc70e12d6a42c27db11a3.tar.gz
drakx-26f364d6608223588dfcc70e12d6a42c27db11a3.tar.bz2
drakx-26f364d6608223588dfcc70e12d6a42c27db11a3.tar.xz
drakx-26f364d6608223588dfcc70e12d6a42c27db11a3.zip
big merge from update 8.1 with cvs
First part. Part 2 following
Diffstat (limited to 'perl-install/network')
-rw-r--r--perl-install/network/adsl.pm3
-rw-r--r--perl-install/network/modem.pm4
-rw-r--r--perl-install/network/netconnect.pm3
-rw-r--r--perl-install/network/network.pm13
4 files changed, 16 insertions, 7 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index cb761dff4..b98744e60 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -170,7 +170,8 @@ LC_ALL=C LANG=C LANGUAGE=C LC_MESSAGES=C /usr/sbin/adsl-start $netc->{NET_DEVICE
/usr/bin/killall pppoe pppd
', $netc->{adsltype}) } elsif ($adsl_type eq 'speedtouch') {
write_cnx_script($netc, 'adsl',
-'/usr/share/speedtouch/speedtouch.sh start
+'/sbin/route del default
+/usr/share/speedtouch/speedtouch.sh start
',
'/usr/share/speedtouch/speedtouch.sh stop
', $netc->{adsltype}) }
diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm
index 6fb48ae78..046ebbf8d 100644
--- a/perl-install/network/modem.pm
+++ b/perl-install/network/modem.pm
@@ -20,7 +20,9 @@ sub configure{
modem_step_1:
pppConfig($netcnx->{$netcnx->{type}}, $mouse, $netc) or return;
write_cnx_script($netc, "modem",
-q(ifup ppp0
+q(
+/sbin/route del default
+ifup ppp0
),
q(ifdown ppp0
killall pppd
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 22baf92b7..3e0029cf5 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -224,7 +224,7 @@ ifdown eth0
} elsif ($nb == 1) {
$netc->{internet_cnx_choice} = (keys %{$netc->{internet_cnx}})[0];
}
- member($netc->{internet_cnx_choice}, ('modem', 'adsl', 'isdn')) and
+ member($netc->{internet_cnx_choice}, ('adsl', 'isdn')) and
$netc->{at_boot} = $in->ask_yesorno(_("Network Configuration Wizard"), _("Do you want to start the connection at boot?"));
if ($netc->{internet_cnx_choice} ) {
write_cnx_script($netc);
@@ -274,6 +274,7 @@ environnement to avoid hostname changing problem."));
#!/bin/bash
if [ -n "\$DISPLAY" ]; then
if [ -e /usr/bin/kppp ]; then
+/sbin/route del default
/usr/bin/kppp &
else
/usr/sbin/net_monitor --connect
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 80f9e41b2..933ef2215 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -261,8 +261,12 @@ sub gateway {
sub configureNetworkIntf {
my ($netc, $in, $intf, $net_device, $skip, $module) = @_;
my $text;
- my @wireless_modules = ("airo_cs", "netwave_cs", "ray_cs", "wavelan_cs", "wvlan_cs");
- if (member($module, @wireless_modules)) {
+ my @wireless_modules = ("airo_cs", "netwave_cs", "ray_cs", "wavelan_cs", "wvlan_cs", "airport");
+ my $flag = 0;
+ foreach (@wireless_modules) {
+ $module =~ /$_/ and $flag =1;
+ }
+ if ($flag) {
$intf->{wireless_eth} = 1;
$netc->{wireless_eth} = 1;
$intf->{WIRELESS_MODE} = "Managed";
@@ -344,7 +348,8 @@ sub configureNetworkNet {
my ($in, $netc, $intf, @devices) = @_;
$netc->{dnsServer} ||= dns($intf->{IPADDR});
- $netc->{GATEWAY} ||= gateway($intf->{IPADDR});
+ my $gateway_ex = gateway($intf->{IPADDR});
+#- $netc->{GATEWAY} ||= gateway($intf->{IPADDR});
$::isInstall and $in->set_help('configureNetworkHost');
$in->ask_from(_("Configuring network"),
@@ -354,7 +359,7 @@ such as ``mybox.mylab.myco.com''.
You may also enter the IP address of the gateway if you have one"),
[ { label => _("Host name"), val => \$netc->{HOSTNAME} },
{ label => _("DNS server"), val => \$netc->{dnsServer} },
- { label => _("Gateway"), val => \$netc->{GATEWAY} },
+ { label => _("Gateway (e.g. %s)", $gateway_ex), val => \$netc->{GATEWAY} },
if_(@devices > 1,
{ label => _("Gateway device"), val => \$netc->{GATEWAYDEV}, list => \@devices },
),