Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (373cd8f48484337c53a5da1c0889da5e448e2bb2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Juuso Alasuutari (373cd8f48484337c53a5da1c0889da5e448e2bb2)
  • Date: Sun, 17 Dec 2006 06:31:53 -0600

GIT changes to master grimoire by Juuso Alasuutari <iuso AT sourcemage.org>:

net/wpa_supplicant/FINAL | 7 ++++---
net/wpa_supplicant/HISTORY | 10 ++++++++++
net/wpa_supplicant/INSTALL | 7 +++++--
net/wpa_supplicant/init.d/wpa_supplicant | 4 ++--
net/wpa_supplicant/init.d/wpa_supplicant.conf | 4 ++--
net/wpa_supplicant/wpa_ctrl.conf | 9 ---------
net/wpa_supplicant/wpa_supplicant.conf | 16 ++++++++++++++++
7 files changed, 39 insertions(+), 18 deletions(-)

New commits:
commit 373cd8f48484337c53a5da1c0889da5e448e2bb2
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

wpa_supplicant: install man pages, better default conffile, minor fixes

diff --git a/net/wpa_supplicant/FINAL b/net/wpa_supplicant/FINAL
index f4b98a6..d113d4b 100755
--- a/net/wpa_supplicant/FINAL
+++ b/net/wpa_supplicant/FINAL
@@ -1,3 +1,4 @@
-message "\n${MESSAGE_COLOR}If you installed the init script you probably" \
- "need to edit\n/etc/sysconfig/wpa_supplicant to suit your system" \
- "configuration.${DEFAULT_COLOR}\n"
+message "${MESSAGE_COLOR}If you installed the init script you probably" \
+ "need to edit\n/etc/sysconfig/wpa_supplicant and" \
+ "/etc/wpa_supplicant.conf\nto configure hardware and network" \
+ "settings.${DEFAULT_COLOR}"
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index ca2bbb4..0985abc 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,13 @@
+2006-12-17 Juuso Alasuutari <iuso AT sourcemage.org>
+ * wpa_supplicant.conf: Added, new name for default config file.
+ Added ap_scan option and comments.
+ * wpa_ctrl.conf: Deleted.
+ * INSTALL: Changed default config file name, install man pages.
+ * FINAL: Added info about default config file to message.
+ * init.d/wpa_supplicant: Changed status msg wording.
+ * init.d/wpa_supplicant.conf: Changed default interface (wlan ->
+ eth1), changed default config file name.
+
2006-11-27 Juuso Alasuutari <iuso AT sourcemage.org>
* PREPARE: Added, query which release to build (new option is devel).
* DETAILS: Added devel release version 0.5.6, modified descriptions.
diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index 96f3735..95514cb 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -1,7 +1,10 @@
make DESTDIR="$INSTALL_ROOT" install &&

-install_config_file "$SCRIPT_DIRECTORY/wpa_ctrl.conf" \
- "$INSTALL_ROOT/etc/wpa_ctrl.conf" &&
+install_config_file "$SCRIPT_DIRECTORY/wpa_supplicant.conf" \
+ "$INSTALL_ROOT/etc/wpa_supplicant.conf" &&
+
+cp doc/docbook/*.8 "$INSTALL_ROOT/usr/share/man/man8/" &&
+cp doc/docbook/*.5 "$INSTALL_ROOT/usr/share/man/man5/" &&

if is_depends_enabled $SPELL qt-x11
then
diff --git a/net/wpa_supplicant/init.d/wpa_supplicant
b/net/wpa_supplicant/init.d/wpa_supplicant
index 7214f89..90dcd79 100755
--- a/net/wpa_supplicant/init.d/wpa_supplicant
+++ b/net/wpa_supplicant/init.d/wpa_supplicant
@@ -18,7 +18,7 @@ start()
if /usr/sbin/iwconfig 2>&1 | grep -q "^$INTERFACE "; then
if [[ $(/usr/sbin/iwconfig 2>/dev/null | grep "$INTERFACE
*unassociated") ]]
then
- echo Starting control interface...
+ echo Starting wpa_supplicant...
$PROGRAM -B -i $INTERFACE -D $DRIVER -c $CONFIG -g $CONTROL
evaluate_retval
/bin/echo "INTERFACE=\"$INTERFACE\"" 2>/dev/null > $DROPFILE
@@ -44,7 +44,7 @@ stop()
required_executable $CLI

[[ -f $DROPFILE ]] && . $DROPFILE && rm $DROPFILE
- echo Stopping control interface...
+ echo Stopping wpa_supplicant...
$CLI -i $INTERFACE terminate 1>/dev/null
evaluate_retval
}
diff --git a/net/wpa_supplicant/init.d/wpa_supplicant.conf
b/net/wpa_supplicant/init.d/wpa_supplicant.conf
index 5bca903..8ffd3e1 100644
--- a/net/wpa_supplicant/init.d/wpa_supplicant.conf
+++ b/net/wpa_supplicant/init.d/wpa_supplicant.conf
@@ -3,13 +3,13 @@
#

# Network interface name
-INTERFACE=wlan
+INTERFACE=eth1

# Device driver
DRIVER=wext

# Config file
-CONFIG=/etc/wpa_ctrl.conf
+CONFIG=/etc/wpa_supplicant.conf

# Global control interface socket
CONTROL=/var/run/wpa_supplicant-global
diff --git a/net/wpa_supplicant/wpa_ctrl.conf
b/net/wpa_supplicant/wpa_ctrl.conf
deleted file mode 100644
index d3af0d6..0000000
--- a/net/wpa_supplicant/wpa_ctrl.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# wpa_supplicant control interface config for Source Mage GNU/Linux.
-#
-
-# Control interface
-ctrl_interface=/var/run/wpa_supplicant
-
-# Members of this group can access the control interface
-ctrl_interface_group=root
diff --git a/net/wpa_supplicant/wpa_supplicant.conf
b/net/wpa_supplicant/wpa_supplicant.conf
new file mode 100644
index 0000000..6201004
--- /dev/null
+++ b/net/wpa_supplicant/wpa_supplicant.conf
@@ -0,0 +1,16 @@
+#
+# wpa_supplicant default config for Source Mage GNU/Linux.
+#
+# See 'man wpa_supplicant.conf' for more info.
+#
+
+# Control interface
+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
+ap_scan=1
+
+### Add network blocks after this line ###




Archive powered by MHonArc 2.6.24.

Top of Page