aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2007-09-17 17:44:10 +0000
committerRoy Marples <roy@marples.name>2007-09-17 17:44:10 +0000
commitcc7df1d1f8605cc06f45180615d4a135383098a6 (patch)
treeb575fc5f000ccf24bd2e8b31f5afe36027c296b7
parentbcb85a016def25097ed21fcd702affd3e4203919 (diff)
Document the preferance of wpa_supplicant, #192828.
-rw-r--r--ChangeLog4
-rw-r--r--conf.d.BSD/net.example10
-rw-r--r--conf.d.Linux/net.example4
3 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ead61b57..dbf33c45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2
+ 17 Sep 2007; Roy Marples <uberlord@gentoo.org>:
+
+ Document the preferance of wpa_supplicant, #192828.
+
09 Sep 2007; Mike Frysinger <vapier@gentoo.org>:
Allow people to specify a list of dirs to clean in bootmisc #191807. Force
diff --git a/conf.d.BSD/net.example b/conf.d.BSD/net.example
index 4acee47a..77d0e7fc 100644
--- a/conf.d.BSD/net.example
+++ b/conf.d.BSD/net.example
@@ -106,11 +106,13 @@
#-----------------------------------------------------------------------------
# WIRELESS (802.11 support)
-# Wireless can be provided by BSDs ifconfig or wpa_supplicant
+# Wireless can be provided by BSDs ifconfig (iwconfig) or wpa_supplicant
+# wpa_supplicant is preferred, use the modules directive to prefer iwconfig.
+#modules="iwconfig"
-# ifconfig support is a one shot script - wpa_supplicant is daemon that
-# scans, assoicates and re-configures if assocation is lost.
-# wpa_supplicant is preferred
+# ifconfig (iwconig) support is a one shot script - wpa_supplicant is daemon
+# that scans, assoicates and re-configures if assocation is lost.
+# We call it iwconfig to seperate the wireless setup from ifconfig.
####################################
# HINTS
#
diff --git a/conf.d.Linux/net.example b/conf.d.Linux/net.example
index ba043eaa..040b42c2 100644
--- a/conf.d.Linux/net.example
+++ b/conf.d.Linux/net.example
@@ -150,7 +150,9 @@
#-----------------------------------------------------------------------------
# WIRELESS (802.11 support)
# Wireless can be provided by iwconfig or wpa_supplicant
-
+# wpa_supplicant is preferred, use the modules directive to prefer iwconfig.
+#modules="iwconfig"
+#
# iwconfig
# emerge net-wireless/wireless-tools
###############################################