sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (75e1171e887c265ec9a6288a3fef2e57c86c9a97)
- From: Vlad Glagolev <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (75e1171e887c265ec9a6288a3fef2e57c86c9a97)
- Date: Thu, 30 Oct 2008 10:23:48 -0500
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:
net/wpa_supplicant/BUILD | 26 ++---
net/wpa_supplicant/CONFIGURE | 140
+++++++++++++------------------
net/wpa_supplicant/DEPENDS | 57 +++++-------
net/wpa_supplicant/DETAILS | 39 +++-----
net/wpa_supplicant/HISTORY | 9 +
net/wpa_supplicant/INSTALL | 25 ++---
net/wpa_supplicant/PREPARE | 13 +-
net/wpa_supplicant/PRE_BUILD | 28 ++----
net/wpa_supplicant/init.d/wpa_supplicant | 22 +---
9 files changed, 157 insertions(+), 202 deletions(-)
New commits:
commit 75e1171e887c265ec9a6288a3fef2e57c86c9a97
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
wpa_supplicant: mass fix.
diff --git a/net/wpa_supplicant/BUILD b/net/wpa_supplicant/BUILD
index 3a0c415..ddeac08 100755
--- a/net/wpa_supplicant/BUILD
+++ b/net/wpa_supplicant/BUILD
@@ -1,6 +1,6 @@
-if [[ "${WPA_RELEASE}" == "devel" ]]; then
- cd "$SOURCE_DIRECTORY/wpa_supplicant"
-fi &&
+if [[ $WPA_RELEASE == devel ]]; then
+ cd "$SOURCE_DIRECTORY/wpa_supplicant"
+fi &&
# Create .config file for make (this is here instead of PRE_BUILD because
# OPTS isn't available there, and this is equivalent to running ./configure
@@ -16,22 +16,18 @@ local VARS="CONFIG_NO_WPA CONFIG_DNET_PCAP
CONFIG_L2_PACKET CONFIG_NO_WPA2 \
CONFIG_EAP_LEAP CONFIG_EAP_SAKE CONFIG_EAP_GPSK \
CONFIG_EAP_GPSK_SHA256 CONFIG_PKCS12 CONFIG_SMARTCARD" var
&&
-if [[ $WPA_RELEASE != old ]]
-then
+if [[ $WPA_RELEASE != old ]]; then
VARS="$VARS CONFIG_TLS"
-fi &&
+fi &&
-for var in $VARS $OPTS
-do
- if [[ ${!var} && ${!var} != n ]]
- then
+for var in $VARS $OPTS; do
+ if [[ ${!var} && ${!var} != n ]]; then
echo "$var=${!var}" >> .config
fi
-done &&
+done &&
-make &&
+make &&
-if is_depends_enabled $SPELL qt-x11
-then
- make wpa_gui
+if is_depends_enabled $SPELL qt-x11; then
+ make wpa_gui
fi
diff --git a/net/wpa_supplicant/CONFIGURE b/net/wpa_supplicant/CONFIGURE
index 70a4a2a..5aee521 100755
--- a/net/wpa_supplicant/CONFIGURE
+++ b/net/wpa_supplicant/CONFIGURE
@@ -2,58 +2,45 @@
# automatically enabled in Makefile if relevant options are chosen,
# prompting about them is unnecessary.
-config_query CONFIG_NO_WPA "Build without WPA support?" n &&
-
-if [[ $WPA_RELEASE == old ]]
-then
- if [[ $CONFIG_CTRL_IFACE == unix || $CONFIG_CTRL_IFACE == udp ]]
- then
- CONFIG_CTRL_IFACE=y &&
- persistent_add CONFIG_CTRL_IFACE
- fi &&
- if [[ -z $CONFIG_DNET_PCAP ]] &&
- [[ $CONFIG_L2_PACKET == pcap ]]
- then
- CONFIG_DNET_PCAP=y &&
- persistent_add CONFIG_DNET_PCAP
- fi &&
-
- config_query CONFIG_CTRL_IFACE \
- "Build external control interface?" \
- y &&
- config_query CONFIG_DNET_PCAP \
- "Use libpcap/libdnet instead of native Linux packet socket \
-interface?" \
- n
+config_query CONFIG_NO_WPA "Build without WPA support?" n &&
+
+if [[ $WPA_RELEASE == old ]]; then
+ if [[ $CONFIG_CTRL_IFACE == unix || $CONFIG_CTRL_IFACE == udp ]]; then
+ CONFIG_CTRL_IFACE=y &&
+ persistent_add CONFIG_CTRL_IFACE
+ fi &&
+ if [[ -z $CONFIG_DNET_PCAP ]] && [[ $CONFIG_L2_PACKET == pcap ]]; then
+ CONFIG_DNET_PCAP=y &&
+ persistent_add CONFIG_DNET_PCAP
+ fi &&
+
+ config_query CONFIG_CTRL_IFACE "Build external control interface?" y &&
+ config_query CONFIG_DNET_PCAP "Use libpcap/libdnet instead of native Linux
packet socket interface?" n
else
- config_query CONFIG_NO_WPA2 "Build without WPA2 support?" n &&
+ config_query CONFIG_NO_WPA2 "Build without WPA2 support?" n &&
- if [[ $CONFIG_CTRL_IFACE == y ]]
- then
- CONFIG_CTRL_IFACE=unix &&
+ if [[ $CONFIG_CTRL_IFACE == y ]]; then
+ CONFIG_CTRL_IFACE=unix &&
persistent_add CONFIG_CTRL_IFACE
- fi &&
- if [[ -z $CONFIG_L2_PACKET ]] &&
- [[ $CONFIG_DNET_PCAP == y ]]
- then
- CONFIG_L2_PACKET=pcap &&
- persistent_add CONFIG_L2_PACKET
- fi &&
-
- config_query_list CONFIG_CTRL_IFACE \
- "Select control interface to build (n is none):" \
- unix \
- udp \
- n &&
- config_query_list CONFIG_L2_PACKET \
- "Select layer2 packet processing implementation:" \
- linux \
- pcap
-fi &&
-
-config_query CONFIG_NO_STDOUT_DEBUG "Remove debugging code?" n &&
-
-message "${MESSAGE_COLOR}Hardware driver options:${DEFAULT_COLOR}" &&
+ fi &&
+ if [[ -z $CONFIG_L2_PACKET ]] && [[ $CONFIG_DNET_PCAP == y ]]; then
+ CONFIG_L2_PACKET=pcap &&
+ persistent_add CONFIG_L2_PACKET
+ fi &&
+
+ config_query_list CONFIG_CTRL_IFACE "Select control interface to build (n
is none):" \
+ unix \
+ udp \
+ n &&
+
+ config_query_list CONFIG_L2_PACKET "Select layer2 packet processing
implementation:" \
+ linux \
+ pcap
+fi &&
+
+config_query CONFIG_NO_STDOUT_DEBUG "Remove debugging code?" n &&
+
+message "${MESSAGE_COLOR}Hardware driver options:${DEFAULT_COLOR}" &&
#
## Commented-out options require external sources to work, WIP.
@@ -83,45 +70,36 @@ config_query CONFIG_EAP_PSK "EAP-PSK support?" n
&&
config_query CONFIG_EAP_PAX "EAP-PAX support?" n &&
config_query CONFIG_EAP_LEAP "LEAP support?" y &&
-if [[ $WPA_RELEASE != old ]]
-then
- config_query CONFIG_EAP_SAKE "EAP-SAKE support?" n &&
- config_query CONFIG_EAP_GPSK "EAP-GPSK support?" n &&
+if [[ $WPA_RELEASE != old ]]; then
+ config_query CONFIG_EAP_SAKE "EAP-SAKE support?" n &&
+ config_query CONFIG_EAP_GPSK "EAP-GPSK support?" n &&
- if [[ $CONFIG_EAP_GPSK == y ]]
- then
- config_query CONFIG_EAP_GPSK_SHA256 \
- "Build SHA256 cipher suite for EAP-GPSK?" \
- n
+ if [[ $CONFIG_EAP_GPSK == y ]]; then
+ config_query CONFIG_EAP_GPSK_SHA256 "Build SHA256 cipher suite for
EAP-GPSK?" n
fi
-fi &&
+fi &&
if [[ $CONFIG_EAP_TLS == y ||
$CONFIG_EAP_PEAP == y ||
- $CONFIG_EAP_TTLS == y ]]
-then
- message "${MESSAGE_COLOR}Crypto options:${DEFAULT_COLOR}" &&
-
- if [[ $WPA_RELEASE == old ]]
- then
- CONFIG_TLS=openssl &&
- persistent_add CONFIG_TLS
+ $CONFIG_EAP_TTLS == y ]]; then
+ message "${MESSAGE_COLOR}Crypto options:${DEFAULT_COLOR}" &&
+
+ if [[ $WPA_RELEASE == old ]]; then
+ CONFIG_TLS=openssl &&
+ persistent_add CONFIG_TLS
else
- config_query_list CONFIG_TLS \
- "Select TLS library to use:" \
- openssl \
- gnutls \
+ config_query_list CONFIG_TLS "Select TLS library to use:" \
+ openssl \
+ gnutls \
internal
- fi &&
+ fi &&
- config_query CONFIG_PKCS12 "Enable PKCS#12 certificate support?" y &&
- config_query CONFIG_SMARTCARD "Enable smartcard support?" y
-fi &&
+ config_query CONFIG_PKCS12 "Enable PKCS#12 certificate support?" y &&
+ config_query CONFIG_SMARTCARD "Enable smartcard support?" y
+fi &&
-message "${MESSAGE_COLOR}An example config file will be installed" \
- "in /etc if you choose to install\nthe init script." \
- "${DEFAULT_COLOR}" &&
+message "${MESSAGE_COLOR}An example config file will be installed" \
+ "in /etc if you choose to install\nthe init script." \
+ "${DEFAULT_COLOR}" &&
-config_query WPA_CONFIG_FILE \
- "Install config file even without the init script?" \
- n
+config_query WPA_CONFIG_FILE "Install config file even without the init
script?" n
diff --git a/net/wpa_supplicant/DEPENDS b/net/wpa_supplicant/DEPENDS
index 0e35c96..b6628e0 100755
--- a/net/wpa_supplicant/DEPENDS
+++ b/net/wpa_supplicant/DEPENDS
@@ -1,41 +1,30 @@
-depends wireless_tools &&
+depends wireless_tools &&
-if [[ $CONFIG_EAP_SIM == y ||
- $CONFIG_EAP_AKA == y ]]
-then
- depends pcsc-lite
-fi &&
+if [[ $CONFIG_EAP_SIM == y || $CONFIG_EAP_AKA == y ]]; then
+ depends pcsc-lite
+fi &&
-if [[ $CONFIG_TLS &&
- $CONFIG_TLS != internal ]]
-then
- depends $CONFIG_TLS
-fi &&
+if [[ $CONFIG_TLS && $CONFIG_TLS != internal ]]; then
+ depends $CONFIG_TLS
+fi &&
-if [[ $CONFIG_DNET_PCAP == y ||
- $CONFIG_L2_PACKET == pcap ]]
-then
- depends libpcap &&
- depends libdnet
-fi &&
+if [[ $CONFIG_DNET_PCAP == y || $CONFIG_L2_PACKET == pcap ]]; then
+ depends libpcap &&
+ depends libdnet
+fi &&
-if [[ $CONFIG_CTRL_IFACE != n ]]
-then
- optional_depends readline \
- CONFIG_READLINE=y \
- CONFIG_READLINE=n \
- "for Readline support in CLI frontend" &&
+if [[ $CONFIG_CTRL_IFACE != n ]]; then
+ optional_depends readline \
+ CONFIG_READLINE=y \
+ CONFIG_READLINE=n \
+ "for Readline support in CLI frontend" &&
- optional_depends qt-x11 \
- "" \
- "" \
- "to build wpa_gui, a Qt-based GUI frontend"
-fi &&
+ optional_depends qt-x11 "" "" "to build wpa_gui, a Qt-based GUI frontend"
+fi &&
-if [[ $WPA_RELEASE != old ]]
-then
- optional_depends dbus \
- CONFIG_CTRL_IFACE_DBUS=y \
- CONFIG_CTRL_IFACE_DBUS=n \
- "to enable D-Bus control interface"
+if [[ $WPA_RELEASE != old ]]; then
+ optional_depends dbus \
+ CONFIG_CTRL_IFACE_DBUS=y \
+ CONFIG_CTRL_IFACE_DBUS=n \
+ "to enable D-Bus control interface"
fi
diff --git a/net/wpa_supplicant/DETAILS b/net/wpa_supplicant/DETAILS
index 0aa05c2..1afb1ff 100755
--- a/net/wpa_supplicant/DETAILS
+++ b/net/wpa_supplicant/DETAILS
@@ -1,38 +1,33 @@
SPELL=wpa_supplicant
-if [[ $WPA_RELEASE == old ]]
-then
+if [[ $WPA_RELEASE == old ]]; then
VERSION=0.4.11
SOURCE=$SPELL-$VERSION.tar.gz
-#
SOURCE_HASH=sha512:b202b8b5e691f6a9a95c63cf76dc53267ebf1ec52e752843a55794a365cd868ca339657d2b6e427128f17d9f07b79548ad70b96901e75c885e36fff40017ba55
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
-elif [[ $WPA_RELEASE == devel ]]
-then
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+elif [[ $WPA_RELEASE == devel ]]; then
VERSION=0.6.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_HASH=sha512:ee852d0fd9e47a2c249da365d90dc4bddb60bed059feacf9f05b270e18472ab2c634e4b7010e2edb9703d4f0b4c3e700255f7ffa3f797fca7f4ffd5b5035427e
else
VERSION=0.5.10
-#
SOURCE_HASH=sha512:ae6bb4ed49f5f57ded9d588068d5d3510d27d78835fc0d634ea99bd048bfa6e8b43f42cb664d7cd4cbc14fe211aa334f50d6cd5c7f7b2b12855d80b397a7f123
SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://hostap.epitest.fi/releases/${SOURCE}
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://hostap.epitest.fi/releases/$SOURCE
LICENSE[0]=GPL
WEB_SITE=http://hostap.epitest.fi/wpa_supplicant/
ENTERED=20050130
- SHORT="A WPA/WPA2 Supplicant."
+ SHORT="WPA/WPA2 supplicant"
cat << EOF
-wpa_supplicant is a WPA Supplicant for Linux, BSD, and Windows with
-support for WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for
-both desktop/laptop computers and embedded systems. Supplicant is the
-IEEE 802.1X/WPA component that is used in the client stations. It
-implements key negotiation with a WPA Authenticator and it controls the
-roaming and IEEE 802.11 authentication/association of the wlan driver.
+wpa_supplicant is a WPA Supplicant for Linux, BSD, and Windows with support
for
+WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for both desktop/laptop
+computers and embedded systems. Supplicant is the IEEE 802.1X/WPA component
that
+is used in the client stations. It implements key negotiation with a WPA
+Authenticator and it controls the roaming and IEEE 802.11 authentication/
+association of the wlan driver.
-wpa_supplicant is designed to be a "daemon" program that runs in the
-background and acts as the backend component controlling the wireless
-connection. wpa_supplicant supports separate frontend programs and a
-text-based frontend (wpa_cli) and a GUI (wpa_gui) are included with
-wpa_supplicant.
+wpa_supplicant is designed to be a "daemon" program that runs in the
background
+and acts as the backend component controlling the wireless connection.
+wpa_supplicant supports separate frontend programs and a text-based frontend
+(wpa_cli) and a GUI (wpa_gui) are included with wpa_supplicant.
EOF
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 9ac7fdf..8e59079 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,11 @@
+2008-10-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * init.d/wpa_supplicant: fixed wpa_cli usage and off state detection;
+ cleaned up
+ * BUILD, CONFIGURE, DEPENDS, PREPARE: cleaned up
+ * DETAILS: fixed descs; cleaned up; quoting paths
+ * INSTALL cleaned up; use install instead of cp; SPELL > SCRIPT
+ * PRE_BUILD: SPELL > SCRIPT; cleaned up
+
2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply gcc43.patch
* gcc43.patch: Patch to compile with gcc 4.3.0
@@ -115,4 +123,3 @@
2005-06-20 David Brown <dmlb2000 AT excite.com>
* ALL: created spell
-
diff --git a/net/wpa_supplicant/INSTALL b/net/wpa_supplicant/INSTALL
index 97c6e5f..f655c2e 100755
--- a/net/wpa_supplicant/INSTALL
+++ b/net/wpa_supplicant/INSTALL
@@ -1,19 +1,16 @@
-make DESTDIR="$INSTALL_ROOT" install &&
+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/" &&
+install -vm 644 doc/docbook/*.8 "$INSTALL_ROOT/usr/share/man/man8" &&
+install -vm 644 doc/docbook/*.5 "$INSTALL_ROOT/usr/share/man/man5" &&
-mkdir -p "$INSTALL_ROOT/usr/share/doc/wpa_supplicant/" &&
-cp wpa_supplicant.conf "$INSTALL_ROOT/usr/share/doc/wpa_supplicant/" &&
+install -vm 755 -d "$INSTALL_ROOT/usr/share/doc/wpa_supplicant" &&
+install -vm 644 wpa_supplicant.conf
"$INSTALL_ROOT/usr/share/doc/wpa_supplicant" &&
-if is_depends_enabled $SPELL qt-x11
-then
- cp wpa_gui/wpa_gui "$INSTALL_ROOT/usr/sbin/"
-fi &&
+if is_depends_enabled $SPELL qt-x11; then
+ install -vm 755 wpa_gui/wpa_gui "$INSTALL_ROOT/usr/sbin"
+fi &&
-if [[ $WPA_CONFIG_FILE == y ]] ||
- list_find "$INIT_INSTALLED" wpa_supplicant
-then
- install_config_file "$SCRIPT_DIRECTORY/wpa_supplicant.conf" \
- "$INSTALL_ROOT/etc/wpa_supplicant.conf"
+if [[ $WPA_CONFIG_FILE == y ]] || list_find "$INIT_INSTALLED"
wpa_supplicant; then
+ install_config_file "$SPELL_DIRECTORY/wpa_supplicant.conf" \
+ "$INSTALL_ROOT/etc/wpa_supplicant.conf"
fi
diff --git a/net/wpa_supplicant/PREPARE b/net/wpa_supplicant/PREPARE
index 9f8d269..5f44ac5 100755
--- a/net/wpa_supplicant/PREPARE
+++ b/net/wpa_supplicant/PREPARE
@@ -1,8 +1,7 @@
-message "${MESSAGE_COLOR}Latest stable is 0.5.10, latest old is 0.4.11." \
- "${DEFAULT_COLOR}" &&
+message "${MESSAGE_COLOR}Latest stable is 0.5.10, latest old is 0.4.11." \
+ "${DEFAULT_COLOR}" &&
-config_query_list WPA_RELEASE \
- "Select which release to build:" \
- stable \
- old \
- devel
+config_query_list WPA_RELEASE "Select which release to build:" \
+ stable \
+ old \
+ devel
diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index ed32b48..8b7ed43 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -1,22 +1,20 @@
-default_pre_build &&
-if [[ "${WPA_RELEASE}" == "devel" ]]; then
- cd "$SOURCE_DIRECTORY/wpa_supplicant"
+default_pre_build &&
+
+if [[ $WPA_RELEASE == devel ]]; then
+ cd "$SOURCE_DIRECTORY/wpa_supplicant"
else
- cd "$SOURCE_DIRECTORY"
-fi &&
+ cd "$SOURCE_DIRECTORY"
+fi &&
-patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&
+patch -p1 < "$SPELL_DIRECTORY/gcc43.patch" &&
-sed -i "s|/local||g" Makefile &&
+sed -i "s|/local||g" Makefile &&
# Dynamic EAP target borks install.
-if [[ $WPA_RELEASE != old ]]
-then
- sed -i "s/wpa_cli dynamic_eap_methods/wpa_cli/" Makefile
-fi &&
-
+if [[ $WPA_RELEASE != old ]]; then
+ sed -i "s/wpa_cli dynamic_eap_methods/wpa_cli/" Makefile
+fi &&
-if [[ -z $QTDIR ]] && is_depends_enabled $SPELL qt-x11
-then
- . "$INSTALL_ROOT/etc/profile.d/qt.sh"
+if [[ -z $QTDIR ]] && is_depends_enabled $SPELL qt-x11; then
+ . "$INSTALL_ROOT/etc/profile.d/qt.sh"
fi
diff --git a/net/wpa_supplicant/init.d/wpa_supplicant
b/net/wpa_supplicant/init.d/wpa_supplicant
index 5660a3f..1012147 100755
--- a/net/wpa_supplicant/init.d/wpa_supplicant
+++ b/net/wpa_supplicant/init.d/wpa_supplicant
@@ -16,26 +16,22 @@ start()
required_executable /usr/sbin/iwconfig
local IWCONFIG=`builtin echo $(/usr/sbin/iwconfig $INTERFACE 2>&1)`
- if [[ "$IWCONFIG" == $INTERFACE\ unassociated* ||
- "$IWCONFIG" == $INTERFACE\ *ESSID:off/any* ||
- "$IWCONFIG" == $INTERFACE\ *ESSID:\"\"* ]]
- then
+ if [[ "$IWCONFIG" == $INTERFACE\ *Access\ Point:\ Not-Associated* ||
+ "$IWCONFIG" == $INTERFACE\ *ESSID:off/any* ||
+ "$IWCONFIG" == $INTERFACE\ *ESSID:\"\"* ]]; then
echo Starting wpa_supplicant...
- $PROGRAM -B -i $INTERFACE -D $DRIVER -c $CONFIG -g $CONTROL
+ $PROGRAM -B -i $INTERFACE -D $DRIVER -c $CONFIG -g $CONTROL > /dev/null
>&1
evaluate_retval
- /bin/echo "INTERFACE=\"$INTERFACE\"" 2>/dev/null > $DROPFILE
- elif [[ "$IWCONFIG" == $INTERFACE\ radio\ off* ]]
- then
+ echo "INTERFACE=\"$INTERFACE\"" > $DROPFILE
+ elif [[ "$IWCONFIG" == $INTERFACE\ radio\ off* ]]; then
echo $INTERFACE: radio off
(exit 1)
evaluate_retval
- elif [[ "$IWCONFIG" == $INTERFACE\ no\ wireless* ]]
- then
+ elif [[ "$IWCONFIG" == $INTERFACE\ no\ wireless* ]]; then
echo $INTERFACE: no wireless extensions
(exit 1)
evaluate_retval
- elif [[ "$IWCONFIG" == $INTERFACE\ No\ such* ]]
- then
+ elif [[ "$IWCONFIG" == $INTERFACE\ No\ such* ]]; then
echo $INTERFACE: no such device
(exit 1)
evaluate_retval
@@ -52,7 +48,7 @@ stop()
[[ -f $DROPFILE ]] && . $DROPFILE && rm $DROPFILE
echo Stopping wpa_supplicant...
- $CLI -i $INTERFACE terminate 1>/dev/null
+ $CLI -i $INTERFACE terminate 1 > /dev/null 2>&1
evaluate_retval
}
-
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (75e1171e887c265ec9a6288a3fef2e57c86c9a97),
Vlad Glagolev, 10/30/2008
- Re: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (75e1171e887c265ec9a6288a3fef2e57c86c9a97), Jeremy Blosser, 10/30/2008
Archive powered by MHonArc 2.6.24.