diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2008-02-06 02:58:39 +0100 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2008-02-06 02:58:39 +0100 |
| commit | 4a22d220f623b6ec1f52c7a15b71ec036776c51f (patch) | |
| tree | 0aad71a0a9007137d76213fd6bcc323f3e082370 /Network | |
| parent | 0e76c3c59e42070b62501a70e66318149b04dc20 (diff) | |
Several fixes to slackware ethernet/wifi configuration.
* Use rc.inet1.conf keys for wifi instead of the ancient wireless.opts.
* Treat empty values as undef ones
* clean out the wireless.opts parsing/replacing, this isn't used anymore
Diffstat (limited to 'Network')
| -rw-r--r-- | Network/Ifaces.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Network/Ifaces.pm b/Network/Ifaces.pm index 4a5370f..d1a9849 100644 --- a/Network/Ifaces.pm +++ b/Network/Ifaces.pm @@ -2561,9 +2561,9 @@ sub get_interface_parse_table [ "gateway", \&get_gateway, RC_INET_CONF, GATEWAY, "%address%", "%netmask%" ], [ "auto", \&Utils::Parse::get_trivial, 1 ], [ "bootproto", \&get_slackware_bootproto, [RC_INET_CONF, IFACE]], - [ "essid", \&Utils::Parse::get_wireless_opts, [ WIRELESS, IFACE], \&get_wireless_ifaces, ESSID ], - [ "key_type", \&get_wep_key_type, [ \&Utils::Parse::get_wireless_opts, WIRELESS, IFACE, \&get_wireless_ifaces, KEY ]], - [ "key", \&get_wep_key, [ \&Utils::Parse::get_wireless_opts, WIRELESS, IFACE, \&get_wireless_ifaces, KEY ]], + [ "essid", \&Utils::Parse::get_rcinet1conf, [RC_INET_CONF, IFACE], WLAN_ESSID ], + [ "key_type", \&get_wep_key_type, [ \&Utils::Parse::get_rcinet1conf, RC_INET_CONF, IFACE, WLAN_KEY ]], + [ "key", \&get_wep_key, [ \&Utils::Parse::get_rcinet1conf, RC_INET_CONF, IFACE, WLAN_KEY ]], # Modem stuff [ "ppp_type", \&check_type, [IFACE_TYPE, "modem", \&Utils::Parse::get_trivial, "modem" ]], [ "update_dns", \&check_type, [TYPE, "modem", \&Utils::Parse::get_kw, PPP_OPTIONS, "usepeerdns" ]], @@ -3281,9 +3281,9 @@ sub get_interface_replace_table [ "netmask", \&Utils::Replace::set_rcinet1conf, [ RC_INET_CONF, IFACE ], NETMASK ], [ "gateway", \&Utils::Replace::set_rcinet1conf_global, RC_INET_CONF, GATEWAY ], [ "bootproto", \&set_slackware_bootproto, [ RC_INET_CONF, IFACE ] ], - [ "essid", \&Utils::Replace::set_wireless_opts, [ WIRELESS, IFACE ], \&get_wireless_ifaces, ESSID ], - [ "key", \&Utils::Replace::set_wireless_opts, [ WIRELESS, IFACE ], \&get_wireless_ifaces, KEY ], - [ "key_type", \&set_wep_key_full, [ \&Utils::Replace::set_wireless_opts, WIRELESS, IFACE, \&get_wireless_ifaces, KEY, "%key%" ]], + [ "essid", \&Utils::Replace::set_rcinet1conf, [ RC_INET_CONF, IFACE ], WLAN_ESSID ], + [ "key", \&Utils::Replace::set_rcinet1conf, [ RC_INET_CONF, IFACE ], WLAN_KEY ], + [ "key_type", \&set_wep_key_full, [ \&Utils::Replace::set_rcinet1conf, RC_INET_CONF, IFACE, WLAN_KEY, "%key%" ]], # Modem stuff [ "phone_number", \&check_type, [TYPE, "modem", \&create_chatscript, CHAT ]], [ "phone_number", \&check_type, [TYPE, "modem", \&create_pppgo ]], |