summaryrefslogtreecommitdiffstats
path: root/src/wireless.subr
diff options
context:
space:
mode:
authorJames Rayner <james@archlinux.org>2007-11-10 01:05:11 +0100
committerJames Rayner <james@archlinux.org>2007-11-10 01:05:11 +0100
commit3537beba0d91a4a7947f5439f695cbebff9e6f55 (patch)
tree3b966652b7decf4d9e1a9919290ebae223e9f9f2 /src/wireless.subr
parente9f9e4d54cb3afb6d78a12e85035a24d346c381d (diff)
downloadnetctl-3537beba0d91a4a7947f5439f695cbebff9e6f55.tar.gz
netctl-3537beba0d91a4a7947f5439f695cbebff9e6f55.tar.xz
fixed some cosmetic output issues due to missing newlines
Diffstat (limited to 'src/wireless.subr')
-rw-r--r--src/wireless.subr16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/wireless.subr b/src/wireless.subr
index 5b9bd57..69550bc 100644
--- a/src/wireless.subr
+++ b/src/wireless.subr
@@ -16,7 +16,7 @@ wpa_check()
done
wpa_cli terminate >/dev/null 2>&1
- err "Wireless association failed."
+ err_append "Wireless association failed."
return 1
}
@@ -35,7 +35,7 @@ wep_check()
let timeout++
done
- err "Wireless association failed."
+ err_append "Wireless association failed."
return 1
}
@@ -91,7 +91,7 @@ start_wpa()
sleep 1
if [ ! -f /var/run/wpa_supplicant_${INTERFACE}.pid ]; then
- err "wpa_supplicant did not start, possible configuration error"
+ err_append "wpa_supplicant did not start, possible configuration error"
return 1
fi
}
@@ -101,7 +101,7 @@ wireless_up() {
load_profile $1
if [ ! -d /sys/class/net/$INTERFACE/wireless ]; then
- err "Interface $INTERFACE is not a wireless interface"
+ err_append "Interface $INTERFACE is not a wireless interface"
return 1
fi
@@ -121,7 +121,7 @@ wireless_up() {
if checkyesno $SCAN; then
if ! find_essid $INTERFACE "$ESSID"; then
- err "Network unavailable"
+ err_append "Network unavailable"
return 1
fi
fi
@@ -137,7 +137,7 @@ wireless_up() {
fi
if ! eval iwconfig $INTERFACE $WEP_OPTS; then
- err "Could not set wireless configuration"
+ err_append "Could not set wireless configuration"
return 1
fi
@@ -148,7 +148,7 @@ wireless_up() {
# Temporary bugfix for broken drivers... http://bbs.archlinux.org/viewtopic.php?id=36384
if ! eval iwconfig $INTERFACE mode managed essid "\"$ESSID\""; then
- err "Could not set wireless configuration"
+ err_append "Could not set wireless configuration"
return 1
fi
@@ -159,7 +159,7 @@ wireless_up() {
# Generate configuration
if ! wpa_passphrase "$ESSID" "$KEY" >> $WPA_CONF; then
- err "Configuration generation failed: `cat $WPA_CONF`"
+ err_append "Configuration generation failed: `cat $WPA_CONF`"
return 1
fi