diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-08-25 05:37:43 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-08-25 05:37:43 +0000 |
| commit | 9117ef0c20c3c0bb0f4c238ad74ec3e507ea75cd (patch) | |
| tree | 4bbdd2f99002c2208b0019d7d3b3a2655fc0fe6d | |
| parent | fbcd0969b3316b1c52aa72c9ebade8fbb3ec7c5c (diff) | |
| download | drakx-backup-do-not-use-9117ef0c20c3c0bb0f4c238ad74ec3e507ea75cd.tar drakx-backup-do-not-use-9117ef0c20c3c0bb0f4c238ad74ec3e507ea75cd.tar.gz drakx-backup-do-not-use-9117ef0c20c3c0bb0f4c238ad74ec3e507ea75cd.tar.bz2 drakx-backup-do-not-use-9117ef0c20c3c0bb0f4c238ad74ec3e507ea75cd.tar.xz drakx-backup-do-not-use-9117ef0c20c3c0bb0f4c238ad74ec3e507ea75cd.zip | |
(manage) use network::tools::get_interface_type instead of
/etc/sysconfig/drakconnect in order to avoid to recognize ppp0 as both
modem and adsl (bug 10772)
| -rwxr-xr-x | perl-install/standalone/drakconnect | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect index e4cb640a6..1aa28d9cf 100755 --- a/perl-install/standalone/drakconnect +++ b/perl-install/standalone/drakconnect @@ -200,16 +200,15 @@ sub manage { $notebook->set_property('show-tabs', 0); $notebook->set_property('show-border', 0); - eval(cat_('/etc/sysconfig/drakconnect')); - @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{$_} : $_} = { kind => $_ }; } - foreach (keys %$intf) { - /^ippp/ and $p->{isdn} = { kind => $_ }; - /^ppp0/ and $p->{modem} = { kind => $_ }; + while (my ($device, $interface) = each %$intf) { + my $type; + member($device, keys %name) and next; + $type = network::tools::get_interface_type($interface) and $p->{$type} = { kind => $device }; } $window->{rwindow}->add(gtkpack_(Gtk2::VBox->new, |