Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bin/sugar.in3
-rw-r--r--src/jarabe/desktop/keydialog.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/bin/sugar.in b/bin/sugar.in
index 7b5ca25..1c29a12 100644
--- a/bin/sugar.in
+++ b/bin/sugar.in
@@ -6,6 +6,9 @@ fi
export GTK2_RC_FILES="@prefix@/share/sugar/data/sugar-$SUGAR_SCALING.gtkrc"
+# Needed for executing wpa_passphrase
+export PATH="$PATH":/sbin:/usr/sbin
+
if ! test -f "$GTK2_RC_FILES"; then
echo "sugar: ERROR: Gtk theme for scaling $SUGAR_SCALING not available in path $GTK2_RC_FILES"
exit 1
diff --git a/src/jarabe/desktop/keydialog.py b/src/jarabe/desktop/keydialog.py
index 93f07c4..b9b229b 100644
--- a/src/jarabe/desktop/keydialog.py
+++ b/src/jarabe/desktop/keydialog.py
@@ -239,7 +239,7 @@ class WPAKeyDialog(KeyDialog):
elif len(key) >= 8 and len(key) <= 63:
# passphrase
from subprocess import Popen, PIPE
- p = Popen(['/usr/sbin/wpa_passphrase', ssid, key], stdout=PIPE)
+ p = Popen(['wpa_passphrase', ssid, key], stdout=PIPE)
for line in p.stdout:
if line.strip().startswith("psk="):
real_key = line.strip()[4:]