summaryrefslogtreecommitdiffstats
path: root/src/connections/wireless
diff options
context:
space:
mode:
authorJames Rayner <james@archlinux.org>2008-12-18 07:12:51 +0100
committerJames Rayner <james@archlinux.org>2008-12-18 07:12:51 +0100
commit41197e24cfe9d2bf040d411e6c438aff516d943f (patch)
tree715a9b41e30c9b9d3a97e9084db301ab81a40dd7 /src/connections/wireless
parent07514350b8404670e14f764ef6b3a9114469621e (diff)
downloadnetctl-41197e24cfe9d2bf040d411e6c438aff516d943f.tar.gz
netctl-41197e24cfe9d2bf040d411e6c438aff516d943f.tar.xz
FS11818, improve key handling, use subshells to avoid scope issues after libify
Diffstat (limited to 'src/connections/wireless')
-rw-r--r--src/connections/wireless2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/connections/wireless b/src/connections/wireless
index dbc2a29..bdf458a 100644
--- a/src/connections/wireless
+++ b/src/connections/wireless
@@ -77,7 +77,7 @@ wireless_up() {
# Generate configuration
if [[ "${#KEY}" == "64" ]]; then
echo -e 'network={ \nssid="$ESSID" \npsk=$KEY \n}'> $WPA_CONF
- elif ! wpa_passphrase "$ESSID" "$KEY" >> $WPA_CONF; then
+ elif ! echo "$KEY" | wpa_passphrase "$ESSID" >> $WPA_CONF; then
err_append "Configuration generation failed: `cat $WPA_CONF`"
return 1
fi