diff options
| author | Damien Chaumette <dchaumette@mandriva.com> | 2004-02-13 05:55:31 +0000 |
|---|---|---|
| committer | Damien Chaumette <dchaumette@mandriva.com> | 2004-02-13 05:55:31 +0000 |
| commit | 90d10157fdd25350da908a6283c3fa87e1ad03cf (patch) | |
| tree | 533a3839547b6cac39d5c7c9df3ed9f92128ff07 /perl-install/standalone | |
| parent | 900bb0760753de1b730c0a69f36f2609a848315b (diff) | |
| download | drakx-90d10157fdd25350da908a6283c3fa87e1ad03cf.tar drakx-90d10157fdd25350da908a6283c3fa87e1ad03cf.tar.gz drakx-90d10157fdd25350da908a6283c3fa87e1ad03cf.tar.bz2 drakx-90d10157fdd25350da908a6283c3fa87e1ad03cf.tar.xz drakx-90d10157fdd25350da908a6283c3fa87e1ad03cf.zip | |
- nice ethernet names back
Diffstat (limited to 'perl-install/standalone')
| -rwxr-xr-x | perl-install/standalone/drakconnect | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect index d6c747b40..eae03c94e 100755 --- a/perl-install/standalone/drakconnect +++ b/perl-install/standalone/drakconnect @@ -195,7 +195,9 @@ sub manage { eval(cat_('/etc/sysconfig/drakconnect')); my %name = network::ethernet::get_eth_cards_names(network::ethernet::get_eth_cards); - $p->{$_} = { kind => $_ } foreach keys %name; + foreach (keys %name) { + $p->{/eth|ath|wlan/ ? $name{$_} : $_} = { kind => $_ }; + } foreach (keys %$intf) { /^ippp/ and $p->{isdn} = { kind => $_ }; /^ppp0/ and $p->{modem} = { kind => $_ }; @@ -231,7 +233,7 @@ sub manage { each_index { my ($name, $interface, $protocol) = ($_, $p->{$_}{kind}, $p->{$_}{protocol}); $p->{$name}{gui}{index} = $::i; - build_tree($netc, $p->{$name}{intf} = $intf->{$name} || {}, $name, $interface, $protocol); + build_tree($netc, $p->{$name}{intf} = $intf->{$name =~ /eth|ath|wlan/ ? $interface : $name} || {}, $name, $interface, $protocol); build_notebook($netc, $p->{$name}{intf}, $p->{$name}{gui}, $apply_button, $name, $interface); $notebook->append_page(gtkpack(Gtk2::VBox->new(0,0), $p->{$name}{gui}{notebook})); } (sort keys %$p); @@ -331,7 +333,7 @@ sub build_notebook { $_->set_sensitive(0) foreach $gui->{intf}{IPADDR}, $gui->{intf}{NETMASK}; delete $gui->{intf}{BOOTPROTO}; } - !$intf->{IPADDR} and ($intf->{IPADDR}, $gui->{active}, $intf->{NETMASK}) = get_intf_ip($interface); + !$intf->{IPADDR} and ($intf->{IPADDR}, $gui->{active}, $intf->{NETMASK}) = get_intf_ip($interface_kind); $gui->{netc}{$_}->set_text($netc->{$_}) foreach keys %{$gui->{netc}}; } |