Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (7d9739c2ac568f7bb494aaafaf4210d708951fe1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (7d9739c2ac568f7bb494aaafaf4210d708951fe1)
  • Date: Thu, 7 Sep 2006 13:17:42 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

net/net-tools/DETAILS | 2 +-
net/net-tools/HISTORY | 3 +++
net/net-tools/ifup | 28 +++++++++++++++++++++++++++-
3 files changed, 31 insertions(+), 2 deletions(-)

New commits:
commit 7d9739c2ac568f7bb494aaafaf4210d708951fe1
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

net-tools: finally got around to re-adding working wifi support

diff --git a/net/net-tools/DETAILS b/net/net-tools/DETAILS
index 32ceda1..9c7af5f 100755
--- a/net/net-tools/DETAILS
+++ b/net/net-tools/DETAILS
@@ -4,7 +4,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.tazenda.demon.co.uk/phil/net-tools/$SOURCE

SOURCE_HASH=sha512:8e1ae9bca726ad7d795a06c58388f9e11c1d617d94eebb9ed18bd11e5f34c6541e1ffe631706c407996db86e78df6e5cf1968a2d90b242b473596fda3b6d1eae
- PATCHLEVEL=2
+ PATCHLEVEL=3
LICENSE[0]=GPL
BUILD_API=2
WEB_SITE=http://www.tazenda.demon.co.uk/phil/net-tools
diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY
index 0f0a7a7..a0d325d 100644
--- a/net/net-tools/HISTORY
+++ b/net/net-tools/HISTORY
@@ -1,3 +1,6 @@
+2006-09-07 Arjan Bouter <abouter AT sourcemage.org>
+ * ifup: re-added the right WIFI options
+
2006-06-09 Eric Sandall <eric AT sandall.us>
* DETAILS: Updated PATCHLEVEL to 2
Removed UPDATED
diff --git a/net/net-tools/ifup b/net/net-tools/ifup
index cbef238..f87087e 100644
--- a/net/net-tools/ifup
+++ b/net/net-tools/ifup
@@ -25,8 +25,33 @@ device_is_up()
fi
}

+# $* - parameters for iwconfig, except device name
+# to be called from _do_device_up
+_set_wlan()
+{
+ iwconfig $DEV $* &&
+ IWC="$IWC $*"
+}
+
_do_device_up()
{
+ # collect settings for iwconfig
+ local IWC=
+ [[ -n "$WIFI_NWID" ]] && _set_wlan nwid $WIFI_NWID
+ [[ -n "$WIFI_ESSID" ]] && _set_wlan essid $WIFI_ESSID
+ [[ -n "$WIFI_RATE" ]] && _set_wlan rate $WIFI_RATE
+ [[ -n "$WIFI_MODE" ]] && _set_wlan mode $WIFI_MODE
+ [[ -n "$WIFI_KEY1" ]] && _set_wlan key $WIFI_KEY1 '[1]'
+ [[ -n "$WIFI_KEY2" ]] && _set_wlan key $WIFI_KEY2 '[2]'
+ [[ -n "$WIFI_KEY3" ]] && _set_wlan key $WIFI_KEY3 '[3]'
+ [[ -n "$WIFI_KEY4" ]] && _set_wlan key $WIFI_KEY4 '[4]'
+ [[ -n "$WIFI_DEFAULTKEY" ]] && _set_wlan key "[$WIFI_DEFAULTKEY]"
+ [[ -n "$WIFI_SECMODE" ]] && _set_wlan key $WIFI_SECMODE
+ [[ -n "$WIFI_KEY" ]] && _set_wlan key $WIFI_KEY
+
+ # make sure the wifi settings are applied if any of them are present
+ [[ -n "$IWC" ]] && iwconfig $DEV commit && sleep 2
+
case "$MODE" in
dynamic )
sed -i 's/MODE=.*/MODE=dynamic_set_hostname/' $netdevdir/$DEV.dev &&
@@ -136,7 +161,8 @@ if device_is_up $DEV ; then
exit 0
fi

-unset MODE MODULE IP BROADCAST NETMASK GATEWAY POINTOPOINT MTU WIFI
UP_ON_BOOT MAC NEEDS
+unset MODE MODULE IP BROADCAST NETMASK GATEWAY POINTOPOINT MTU UP_ON_BOOT
MAC NEEDS
+unset WIFI_NWID WIFI_ESSID WIFI_RATE WIFI_MODE WIFI_SECMODE WIFI_ENCKEY
unset do_device_up do_route_up on_up

. $netdevdir/$DEV.dev



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (7d9739c2ac568f7bb494aaafaf4210d708951fe1), Arjan Bouter, 09/07/2006

Archive powered by MHonArc 2.6.24.

Top of Page