Author: arekm
Date: Fri Mar 20 17:03:57 2009
New Revision: 10221
Modified:
rc-scripts/trunk/sysconfig/network-scripts/functions.network
Log:
Set nickname only when specified in config since many wifi adapters don't
support this setting.
Modified: rc-scripts/trunk/sysconfig/network-scripts/functions.network
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/functions.network
(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/functions.network Fri Mar
20 17:03:57 2009
@@ -473,17 +473,12 @@
local val wlan_mode
- if val="$(eval echo \$${prefix}WLAN_NICKNAME)" && [ -z "$val" ]; then
- WLAN_NICKNAME="$(hostname -f 2>/dev/null || hostname
2>/dev/null || echo localhost)"
- else
- WLAN_NICKNAME="$val"
- fi
-
# wlan mode needs to be first
wlan_mode="$(eval echo \$${prefix}WLAN_MODE)" && [ "$wlan_mode" ] && \
iwconfig ${device} mode "$wlan_mode"
- iwconfig ${device} nick ${WLAN_NICKNAME}
+ val="$(eval echo \$${prefix}WLAN_NICKNAME)" && [ "$val" ] && \
+ iwconfig ${device} nick "$val"
val="$(eval echo \$${prefix}WLAN_NWID)" && [ "$val" ] && \
iwconfig ${device} nwid "$val"
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
