beautify ethernet cards name

1 files changed, 9 insertions, 0 deletions

diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index b82eb8c7b..e378da94b 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -196,6 +196,14 @@ sub manage {
     my $config = { 'ethernet0' => { kind => 'eth0' },
 		 }; # testing
 
+    #- duplicated from network::ethernet, to be factorized
+    @all_cards = network::ethernet::get_eth_cards();
+    foreach my $card (@all_cards) {
+	modules::remove_alias($card->[1]);
+	modules::add_alias($card->[0], $card->[1]);
+    }
+    my %name = map { $_->[0] => join(': ', $_->[0], $_->[2]) } @all_cards;
+    
     $window->{rwindow}->add(gtkpack_(Gtk2::VBox->new,
 				     0, $interface_menu = gtksignal_connect(Gtk2::OptionMenu->new,
 									    changed => sub {
@@ -226,6 +234,7 @@ sub manage {
     each_index {
 	my ($name, $interface, $protocol) = ($_, $config->{$_}{kind}, $config->{$_}{protocol});
 	$gui->{$interface}{index} = $::i;
+	$interface =~ /eth/ and $config->{$name{$interface}} = $interface && delete $config->{$name};
 	build_tree($netc, $intf->{$interface} ||= {}, $name, $interface, $protocol);
 	build_notebook($netc, $intf->{$interface}, $gui->{$interface}, $apply_button, $name, $interface);
 	$notebook->append_page(gtkpack(Gtk2::VBox->new(0,0), $gui->{$interface}{notebook}));