summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-10-08 22:12:28 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-10-08 22:12:28 +0000
commit80be4c2ed0d81908051704cb988ddeca169e9b50 (patch)
tree8b8cc57afca5276786404d59c44f664dbfc4c401
parent3a2fdb93c9cc558cc882983206efe146cf427201 (diff)
downloaddrakx-80be4c2ed0d81908051704cb988ddeca169e9b50.tar
drakx-80be4c2ed0d81908051704cb988ddeca169e9b50.tar.gz
drakx-80be4c2ed0d81908051704cb988ddeca169e9b50.tar.bz2
drakx-80be4c2ed0d81908051704cb988ddeca169e9b50.tar.xz
drakx-80be4c2ed0d81908051704cb988ddeca169e9b50.zip
simplify "do not remove wireless parameters from ifcfg when not in wizard mode" fix
-rw-r--r--perl-install/network/network.pm4
-rw-r--r--perl-install/network/tools.pm8
2 files changed, 4 insertions, 8 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 14a280d03..3e9e74e07 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -176,7 +176,7 @@ sub write_interface_conf {
my %cards = map { $_->[0] => $_->[1] } network::ethernet::conf_network_card_backend($netc, $intf);
setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST ONBOOT HWADDR MII_NOT_SUPPORTED),
- if_(is_wireless_intf($intf, $cards{$intf->{DEVICE}}), qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV)),
+ if_(is_wireless_intf($cards{$intf->{DEVICE}}), qw(WIRELESS_MODE WIRELESS_ESSID WIRELESS_NWID WIRELESS_FREQ WIRELESS_SENS WIRELESS_RATE WIRELESS_ENC_KEY WIRELESS_RTS WIRELESS_FRAG WIRELESS_IWCONFIG WIRELESS_IWSPY WIRELESS_IWPRIV)),
if_($intf->{BOOTPROTO} eq "dhcp", qw(DHCP_HOSTNAME NEEDHOSTNAME))
);
log::explanations("written $intf->{DEVICE} interface configuration in $file");
@@ -317,7 +317,7 @@ sub gateway {
sub configureNetworkIntf {
my ($netc, $in, $intf, $net_device, $skip, $module) = @_;
my $text;
- if (is_wireless_intf($intf, $module)) {
+ if (is_wireless_intf($module)) {
$intf->{wireless_eth} = 1;
$netc->{wireless_eth} = 1;
$intf->{WIRELESS_MODE} = "Managed";
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index f8c0cc2d8..993fe2c2a 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -346,12 +346,8 @@ sub use_floppy {
sub is_wireless_intf {
- my ($intf, $module) = @_;
- my @wireless_modules = qw(aironet_cs aironet4500_cs hermes airo orinoco_cs orinoco airo_cs netwave_cs ray_cs wavelan_cs wvlan_cs airport 3c59x);
- foreach (@wireless_modules) {
- return 1 if $module =~ /$_/;
- }
- return 0;
+ my ($module) = @_;
+ member($module, qw(airo aironet_cs aironet4500_cs airo_cs airport hermes orinoco_cs netwave_cs orinoco ray_cs wavelan_cs wvlan_cs))
}
1;