diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-09-08 03:52:30 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-09-08 03:52:30 +0000 |
| commit | b82e295bf883d69cd7e9ed93159ee04f217ae2dd (patch) | |
| tree | 45023456f72ff85fc7ec9511c0445e6b30857408 | |
| parent | e925959bf7e4dfe65394a11245afab07270f8f36 (diff) | |
| download | drakx-b82e295bf883d69cd7e9ed93159ee04f217ae2dd.tar drakx-b82e295bf883d69cd7e9ed93159ee04f217ae2dd.tar.gz drakx-b82e295bf883d69cd7e9ed93159ee04f217ae2dd.tar.bz2 drakx-b82e295bf883d69cd7e9ed93159ee04f217ae2dd.tar.xz drakx-b82e295bf883d69cd7e9ed93159ee04f217ae2dd.zip | |
fix #11287
| -rwxr-xr-x | perl-install/standalone/drakconnect | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect index 9e1087f05..3d5099f2a 100755 --- a/perl-install/standalone/drakconnect +++ b/perl-install/standalone/drakconnect @@ -203,14 +203,19 @@ sub manage { @all_cards = network::ethernet::get_eth_cards($modules_conf); my %name = network::ethernet::get_eth_cards_names($modules_conf, @all_cards); foreach (keys %name) { - $p->{/eth|ath|wlan/ ? $name{$_} : $_} = { name => $_ }; - $p->{name}{intf} = $_; + my $dev = /eth|ath|wlan/ ? $name{$_} : $_; + $p->{$dev} = { + name => $_ , + intf => $intf->{$_} + }; } while (my ($device, $interface) = each %$intf) { - my $type; exists $name{$device} and next; - $type = network::tools::get_interface_type($interface) and $p->{$type} = { name => $device }; - $p->{name}{intf} = $intf->{$device}; + my $type = network::tools::get_interface_type($interface); + $p->{$type || $device} = { + name => $device, + intf => $interface + }; } $window->{rwindow}->add(gtkpack_(Gtk2::VBox->new, @@ -349,7 +354,7 @@ sub build_notebook { if ($is_ethernet) { my $proto = $gui->{intf}{BOOTPROTO}; - $proto->{protocols} = { static => N("static"), dhcp => N("DHCP") }; + $proto->{protocols} = { none => N("none"), static => N("static"), dhcp => N("DHCP") }; $proto->set_popdown_strings(values %{$proto->{protocols}}); $proto->set_text($proto->{protocols}{$intf->{BOOTPROTO}}); foreach ($gui->{intf}{IPADDR}, $gui->{intf}{NETMASK}, $gui->{netc}{GATEWAY}) { |