summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-07-19 05:22:55 +0000
committerOlivier Blin <oblin@mandriva.org>2004-07-19 05:22:55 +0000
commitcd52931e8fd0cc2fd81cea811989604dd7e4770e (patch)
tree2cb04a80f6eac7a631fd22818d6dd87918badfac
parentb0df442cde908324a1fb9d16a2bc544f6eb5d9cd (diff)
downloaddrakx-backup-do-not-use-cd52931e8fd0cc2fd81cea811989604dd7e4770e.tar
drakx-backup-do-not-use-cd52931e8fd0cc2fd81cea811989604dd7e4770e.tar.gz
drakx-backup-do-not-use-cd52931e8fd0cc2fd81cea811989604dd7e4770e.tar.bz2
drakx-backup-do-not-use-cd52931e8fd0cc2fd81cea811989604dd7e4770e.tar.xz
drakx-backup-do-not-use-cd52931e8fd0cc2fd81cea811989604dd7e4770e.zip
do not write wireless encryption key if empty
-rw-r--r--perl-install/network/network.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index da773c8c2..9f4256770 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -168,7 +168,7 @@ sub write_interface_conf {
$intf->{BOOTPROTO} =~ s/dhcp.*/dhcp/;
- local $intf->{WIRELESS_ENC_KEY} = network::tools::convert_wep_key_for_iwconfig($intf->{WIRELESS_ENC_KEY});
+ local $intf->{WIRELESS_ENC_KEY} = $intf->{WIRELESS_ENC_KEY} && network::tools::convert_wep_key_for_iwconfig($intf->{WIRELESS_ENC_KEY});
setVarsInSh($file, $intf, qw(DEVICE BOOTPROTO IPADDR NETMASK NETWORK BROADCAST ONBOOT HWADDR MII_NOT_SUPPORTED),
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))