summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuuso Alasuutari2007-01-17 11:20:05 +0200
committerJaka Kranjc2007-01-21 23:11:57 +0100
commit381907a61eb92c15eca9782fbb6c0ed0f69d462d (patch)
tree07d0c0d1847a8d1edb56015550e687e30b579ddf
parentd94023d94c989d0b4dac20d8235e06be7190c148 (diff)
wpa_supplicant: changed example config file install loc, added more info
to default config file
-rw-r--r--net/wpa_supplicant/HISTORY7
-rwxr-xr-xnet/wpa_supplicant/INSTALL4
-rw-r--r--net/wpa_supplicant/wpa_supplicant.conf11
3 files changed, 18 insertions, 4 deletions
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 262e3d5a63..d2fdc1a154 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,10 @@
+2007-01-17 Juuso Alasuutari <iuso@sourcemage.org>
+ * INSTALL: Changed example config install location to
+ /usr/share/doc/wpa_supplicant.
+ * wpa_supplicant.conf: Changed general info to match install loc
+ change, added info about update_config option, rewrote info
+ for ap_scan option.
+
2007-01-05 Juuso Alasuutari <iuso@sourcemage.org>
* BUILD: Removed redundant sourcing of is_depends_enabled.function,
now in PRE_BUILD.
diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index bf3fdba485..97c6e5f043 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -3,8 +3,8 @@ make DESTDIR="$INSTALL_ROOT" install &&
cp doc/docbook/*.8 "$INSTALL_ROOT/usr/share/man/man8/" &&
cp doc/docbook/*.5 "$INSTALL_ROOT/usr/share/man/man5/" &&
-mkdir -p "$INSTALL_ROOT/usr/share/wpa_supplicant/" &&
-cp wpa_supplicant.conf "$INSTALL_ROOT/usr/share/wpa_supplicant/" &&
+mkdir -p "$INSTALL_ROOT/usr/share/doc/wpa_supplicant/" &&
+cp wpa_supplicant.conf "$INSTALL_ROOT/usr/share/doc/wpa_supplicant/" &&
if is_depends_enabled $SPELL qt-x11
then
diff --git a/net/wpa_supplicant/wpa_supplicant.conf b/net/wpa_supplicant/wpa_supplicant.conf
index 25bea70ce7..4ff7ba61e4 100644
--- a/net/wpa_supplicant/wpa_supplicant.conf
+++ b/net/wpa_supplicant/wpa_supplicant.conf
@@ -1,7 +1,7 @@
#
# wpa_supplicant default config for Source Mage GNU/Linux.
#
-# See /usr/share/wpa_supplicant/wpa_supplicant.conf for more info.
+# See /usr/share/doc/wpa_supplicant/wpa_supplicant.conf for more info.
#
# Control interface
@@ -10,7 +10,14 @@ ctrl_interface=/var/run/wpa_supplicant
# Members of this group can access the control interface
ctrl_interface_group=root
-# Set this to 2 if you have trouble associating with APs using hidden SSIDs
+# Whether to allow wpa_supplicant to update (overwrite) configuration.
+# This is required for wpa_cli/wpa_gui to be able to store the
+# configuration changes permanently.
+#update_config=1
+
+# Setting ap_scan=2 may help associate with APs that use hidden SSIDs,
+# but it might be better to first try using scan_ssid=1 inside the
+# particular network block(s) instead.
ap_scan=1
### Add network blocks after this line ###