diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-20 11:18:07 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-20 11:18:07 +0000 |
| commit | de34527a96b3751426144b65766e2257147757ae (patch) | |
| tree | 9dd471ee839f78977e40a9c089cc030f88a768f6 | |
| parent | 01703a2851b874d08ed600b7f2a7904e10c38d6a (diff) | |
| download | drakx-backup-do-not-use-de34527a96b3751426144b65766e2257147757ae.tar drakx-backup-do-not-use-de34527a96b3751426144b65766e2257147757ae.tar.gz drakx-backup-do-not-use-de34527a96b3751426144b65766e2257147757ae.tar.bz2 drakx-backup-do-not-use-de34527a96b3751426144b65766e2257147757ae.tar.xz drakx-backup-do-not-use-de34527a96b3751426144b65766e2257147757ae.zip | |
fix modem dns servers reading
| -rw-r--r-- | perl-install/network/netconnect.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index f5c777a9a..d8c30cb90 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -77,7 +77,7 @@ sub detect_timezone() { my $first_time = $o_first_time || 0; my ($network_configured, $direct_net_install, $cnx_type, $type, $interface, @cards, @all_cards, @devices); my (%connections, %rconnections, @connection_list); - my ($modem, $modem_name); + my ($modem, $modem_name, $modem_conf_read); my ($ntf_name, $ipadr, $netadr, $gateway_ex, $up, $isdn, $isdn_type, $adsl_type, $need_restart_network); my ($module, $text, $auto_ip, $net_device, $onboot, $needhostname, $hotplug, $track_network_id, @fields); # lan config my $success = 1; @@ -426,13 +426,15 @@ Take a look at http://www.linmodems.org"), q(ifdown ppp0 killall pppd ), $netcnx->{type}); + return if $modem_conf_read; + $modem_conf_read = 1; $netcnx->{$netcnx->{type}} ||= {}; $modem ||= $netcnx->{$netcnx->{type}}; $modem->{device} ||= $first_modem->()->{device}; my %l = getVarsFromSh("$::prefix/usr/share/config/kppprc"); $modem->{connection} ||= $l{Name}; $modem->{domain} ||= $l{Domain}; - ($modem->{dns1}, $modem->{dns2}) ||= split(',', $l{DNS}); + ($modem->{dns1}, $modem->{dns2}) = split(',', $l{DNS}); foreach (cat_("/etc/sysconfig/network-scripts/chat-ppp0")) { /.*ATDT(\d*)/ and $modem->{phone} ||= $1; |