summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorDamien Chaumette <dchaumette@mandriva.com>2004-02-10 18:14:24 +0000
committerDamien Chaumette <dchaumette@mandriva.com>2004-02-10 18:14:24 +0000
commitfcfdee020d19568c9b1b3fd2e55ab36d5b532596 (patch)
tree8b169908608bc21dd58db7af87fa21c80d752465 /perl-install
parentf658121e1c2506eceb4499d105aa79a5a19cfc0e (diff)
downloaddrakx-fcfdee020d19568c9b1b3fd2e55ab36d5b532596.tar
drakx-fcfdee020d19568c9b1b3fd2e55ab36d5b532596.tar.gz
drakx-fcfdee020d19568c9b1b3fd2e55ab36d5b532596.tar.bz2
drakx-fcfdee020d19568c9b1b3fd2e55ab36d5b532596.tar.xz
drakx-fcfdee020d19568c9b1b3fd2e55ab36d5b532596.zip
- isdn and modem are fetched from $intf
- drop useless @all_cards - 'ath' and 'wlan' cards fix
Diffstat (limited to 'perl-install')
-rwxr-xr-xperl-install/standalone/drakconnect12
1 files changed, 7 insertions, 5 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 04049e8a0..c5708107e 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -194,11 +194,13 @@ sub manage {
eval(cat_('/etc/sysconfig/drakconnect'));
- @all_cards = network::ethernet::get_eth_cards();
- my %name = network::ethernet::get_eth_cards_names(@all_cards);
-
+ my %name = network::ethernet::get_eth_cards_names(network::ethernet::get_eth_cards);
$config->{$_} = { kind => $_ } foreach keys %name;
-
+ foreach (keys %$intf) {
+ /^ippp/ and $config->{isdn} = { kind => $_ };
+ /^ppp0/ and $config->{modem} = { kind => $_ };
+ };
+
$window->{rwindow}->add(gtkpack_(Gtk2::VBox->new,
0, $interface_menu = gtksignal_connect(Gtk2::OptionMenu->new,
changed => sub {
@@ -229,7 +231,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};
+ $interface =~ /eth|ath|wlan/ 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}));