diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-09-19 17:53:20 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-09-19 17:53:20 +0000 |
| commit | a05a4317c37bcb641d7b78a6e2f239072db7fa06 (patch) | |
| tree | 6f317351463336010eeb0ae339e29a292a4307b1 /perl-install/network | |
| parent | 4450d40b9e97efc1e51faac873969c01bba3cd0f (diff) | |
| download | drakx-a05a4317c37bcb641d7b78a6e2f239072db7fa06.tar drakx-a05a4317c37bcb641d7b78a6e2f239072db7fa06.tar.gz drakx-a05a4317c37bcb641d7b78a6e2f239072db7fa06.tar.bz2 drakx-a05a4317c37bcb641d7b78a6e2f239072db7fa06.tar.xz drakx-a05a4317c37bcb641d7b78a6e2f239072db7fa06.zip | |
don't try to connect auto-magically ethernet interfaces during configuration in install
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/netconnect.pm | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index b87938e7a..64e8f15ee 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -155,16 +155,20 @@ sub real_main { if ($net->{type} eq 'adsl' && !member($net->{adsl}{method}, qw(static dhcp)) || member($net->{type}, qw(modem isdn isdn_external))) { return "ask_connect_now"; - } elsif ($need_network_restart) { - services::restart("network"); - } else { - #- FIXME: move this in network::tools::restart_net_interface - network::tools::stop_net_interface($net, 0); - if (exists $net->{adsl}{ethernet_device}) { - network::tools::stop_interface($net->{adsl}{ethernet_device}, 0); - network::tools::start_interface($net->{adsl}{ethernet_device}, 0); + } + + unless ($::isInstall) { + if ($need_network_restart) { + services::restart("network"); + } else { + #- FIXME: move this in network::tools::restart_net_interface + network::tools::stop_net_interface($net, 0); + if (exists $net->{adsl}{ethernet_device}) { + network::tools::stop_interface($net->{adsl}{ethernet_device}, 0); + network::tools::start_interface($net->{adsl}{ethernet_device}, 0); + } + network::tools::start_net_interface($net, 0); } - network::tools::start_net_interface($net, 0); } #- FIXME: check for connection here #- check for real interface in connection test |