diff options
| author | damien <damien@mandriva.com> | 2002-01-07 14:32:15 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2002-01-07 14:32:15 +0000 |
| commit | e0199832222d9d362e1350e2d43655535b3313c4 (patch) | |
| tree | 8b9786c832a7cde1b264bb483466b7b5e0111b89 | |
| parent | 9097ddedb83688fc774d6d381337e5df086ed294 (diff) | |
| download | drakx-e0199832222d9d362e1350e2d43655535b3313c4.tar drakx-e0199832222d9d362e1350e2d43655535b3313c4.tar.gz drakx-e0199832222d9d362e1350e2d43655535b3313c4.tar.bz2 drakx-e0199832222d9d362e1350e2d43655535b3313c4.tar.xz drakx-e0199832222d9d362e1350e2d43655535b3313c4.zip | |
corrected network connection during install
| -rw-r--r-- | perl-install/install_steps.pm | 7 | ||||
| -rw-r--r-- | perl-install/network/netconnect.pm | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 991b4f8c6..f562cb272 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -584,6 +584,7 @@ sub configureNetwork { my ($o) = @_; require network; network::configureNetwork2($o, $o->{prefix}, $o->{netc}, $o->{intf}); + $o->{netcnx} ||= 'lan'; } #------------------------------------------------------------------------------ @@ -939,7 +940,7 @@ sub exitInstall { #------------------------------------------------------------------------------ sub hasNetwork { my ($o) = @_; - $o->{netcnx}{internet_cnx_choice} && $o->{netc}{NETWORKING} ne 'no' + $o->{netcnx}{type} && $o->{netc}{NETWORKING} ne 'no' } #------------------------------------------------------------------------------ @@ -950,7 +951,7 @@ sub upNetwork { modules::write_conf($o->{prefix}); if (hasNetwork($o)) { - if ($o->{netc}{internet_cnx_choice} =~ /adsl|network|cable/) { + if ($o->{netcnx}{type} =~ /adsl|lan|cable/) { require network::netconnect; network::netconnect::start_internet($o); return 1; @@ -971,7 +972,7 @@ sub downNetwork { modules::write_conf($o->{prefix}); if (hasNetwork($o)) { - if (!$pppOnly && $o->{netc}{internet_cnx_choice} =~ /adsl|network|cable/) { + if (!$pppOnly && $o->{netc}{type} =~ /adsl|lan|cable/) { require network::netconnect; network::netconnect::stop_internet($o); return 1; diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 0c7d8fef8..22baf92b7 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -136,6 +136,7 @@ sub main { _("Because you are doing a network installation, your network is already configured. Click on Ok to keep your configuration, or cancel to reconfigure your Internet & Network connection. "), 1)) and do { + $netcnx->{type}='lan'; output "$prefix$connect_file", qq( ifup eth0 |