summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-07 05:30:17 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-07 05:30:17 +0000
commit4a77384352e12b436452f23039e2964220b2c334 (patch)
tree03708dd8fcbdd292e1c140e0f03182cb2a582fbd
parent48bbf026ee93972afbb4dbf2fa9c62690466faef (diff)
downloaddrakx-backup-do-not-use-4a77384352e12b436452f23039e2964220b2c334.tar
drakx-backup-do-not-use-4a77384352e12b436452f23039e2964220b2c334.tar.gz
drakx-backup-do-not-use-4a77384352e12b436452f23039e2964220b2c334.tar.bz2
drakx-backup-do-not-use-4a77384352e12b436452f23039e2964220b2c334.tar.xz
drakx-backup-do-not-use-4a77384352e12b436452f23039e2964220b2c334.zip
(del_intf) use more detailled device names on Fabrice Facorat suggestion
-rwxr-xr-xperl-install/standalone/drakconnect10
1 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 24a63bb4b..9e1087f05 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -650,6 +650,8 @@ sub del_intf() {
$in->ask_warn(N("Error"), N("No ethernet network adapter has been detected on your system. Please run the hardware configuration tool."));
$in->exit(0);
}
+ @all_cards = network::ethernet::get_eth_cards($modules_conf);
+ my %ethernet_names = network::ethernet::get_eth_cards_names($modules_conf, @all_cards);
my $wiz =
{
defaultimage => "drakconnect.png",
@@ -659,7 +661,13 @@ sub del_intf() {
no_back => 1,
name => N("Select the network interface to remove:"),
data => [ { label => N("Net Device"), val => \$intf2delete, allow_empty_list => 1,
- list => [ keys %$intf, grep { -f "/etc/ppp/peers/$_" } qw(adsl isdn) ], } ],
+ list => [ keys %$intf ],
+ format => sub {
+ my $type = network::tools::get_interface_type($intf->{$_[0]});
+ $ethernet_names{$_[0]} || ($type ? "$type ($_[0])" : $_[0])
+ }
+ }
+ ],
post => sub {
!$::testing and eval {
if (member($intf2delete, qw(adsl modem))) {