summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-08-04 16:48:12 +0000
committerOlivier Blin <oblin@mandriva.org>2005-08-04 16:48:12 +0000
commite616f4fe10258f1070dcfa57a79fc7c8d3c581e2 (patch)
tree5f851c1597f3dde731eb83133b1f6ddf41b8bcab /perl-install
parent532935a78034436d19aefcdac7a9118cb9a20bf1 (diff)
downloaddrakx-e616f4fe10258f1070dcfa57a79fc7c8d3c581e2.tar
drakx-e616f4fe10258f1070dcfa57a79fc7c8d3c581e2.tar.gz
drakx-e616f4fe10258f1070dcfa57a79fc7c8d3c581e2.tar.bz2
drakx-e616f4fe10258f1070dcfa57a79fc7c8d3c581e2.tar.xz
drakx-e616f4fe10258f1070dcfa57a79fc7c8d3c581e2.zip
make is_ifplugd_blacklisted return a boolean
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/netconnect.pm11
1 files changed, 5 insertions, 6 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 352448088..23ceacf96 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -112,9 +112,9 @@ sub real_main {
};
my $is_ifplugd_blacklisted = sub {
- bool2yesno(member($module, qw(b44 forcedeth madwifi_pci via-velocity)) ||
- $is_wireless ||
- find { $_->{device} eq $ntf_name } detect_devices::pcmcia_probe());
+ member($module, qw(b44 forcedeth madwifi_pci via-velocity)) ||
+ $is_wireless ||
+ find { $_->{device} eq $ntf_name } detect_devices::pcmcia_probe();
};
my %adsl_descriptions = (
@@ -727,7 +727,7 @@ If you do not know, choose 'use PPPoE'"),
$net->{type} = 'adsl';
# blacklist bogus driver, enable ifplugd support else:
$find_lan_module->();
- $ethntf->{MII_NOT_SUPPORTED} ||= $is_ifplugd_blacklisted->();
+ $ethntf->{MII_NOT_SUPPORTED} ||= bool2yesno($is_ifplugd_blacklisted->());
if ($ntf_name eq "sagem" && member($net->{adsl}{method}, qw(static dhcp))) {
#- "fctStartAdsl -i" builds ifcfg-ethX from ifcfg-sagem and echoes ethX
#- it auto-detects dhcp/static modes thanks to encapsulation setting
@@ -872,8 +872,7 @@ If you do not know, choose 'use PPPoE'"),
$peeryp = $ethntf->{PEERYP} =~ /yes/;
$peerntpd = $ethntf->{PEERNTPD} =~ /yes/;
# blacklist bogus driver, enable ifplugd support else:
- $ethntf->{MII_NOT_SUPPORTED} ||= $is_ifplugd_blacklisted->();
- $ifplugd = !text2bool($ethntf->{MII_NOT_SUPPORTED});
+ $ifplugd = !text2bool($ethntf->{MII_NOT_SUPPORTED}) && !$is_ifplugd_blacklisted->();
$track_network_id = $::isStandalone && $ethntf->{HWADDR} || detect_devices::isLaptop();
delete $ethntf->{TYPE} if $net->{type} ne 'adsl' || !member($net->{adsl}{method}, qw(static dhcp));
$ethntf->{DHCP_CLIENT} ||= (find { -x "$::prefix/sbin/$_" } qw(dhclient dhcpcd pump dhcpxd));