summaryrefslogtreecommitdiffstats
path: root/src-wireless
diff options
context:
space:
mode:
authorJim Pryor <profjim@jimpryor.net>2009-08-11 18:49:04 +0200
committerJames Rayner <james@archlinux.org>2009-09-07 11:46:25 +0200
commitc2b6decd51289abe3d969f305f709fb4243fe6f1 (patch)
treeb3b4ad6abd73f60de3aba0c591ed3f51b308fc82 /src-wireless
parent3e6d122b2fba58080d3aa3e94d766084d3d42f91 (diff)
downloadnetctl-c2b6decd51289abe3d969f305f709fb4243fe6f1.tar.gz
netctl-c2b6decd51289abe3d969f305f709fb4243fe6f1.tar.xz
wireless-dbus tweaks
Signed-off-by: Jim Pryor <profjim@jimpryor.net>
Diffstat (limited to 'src-wireless')
-rw-r--r--src-wireless/wireless-dbus4
1 files changed, 2 insertions, 2 deletions
diff --git a/src-wireless/wireless-dbus b/src-wireless/wireless-dbus
index 838609d..459e2fd 100644
--- a/src-wireless/wireless-dbus
+++ b/src-wireless/wireless-dbus
@@ -188,7 +188,7 @@ def start(profile, essid):
def stop(profile):
ret = subprocess.call([ETHERNET_IPROUTE, "down", sys.argv[2]])
os.kill(int(open("/var/run/wpa_supplicant.pid").read()),SIGTERM)
- sys.exit(0)
+ sys.exit(ret)
if __name__ == "__main__":
@@ -197,7 +197,7 @@ if __name__ == "__main__":
WIRELESS = os.path.join(CONN_DIR,"wireless")
# setup bash report_* handler
- report_handler_script = 'source /etc/rc.conf; source /etc/rc.d/functions; source %s/../globals; while read cmd args; do eval $cmd "$args"; done' % (CONN_DIR,)
+ report_handler_script = 'source %s/../globals; while read cmd args; do eval $cmd "$args"; done' % (CONN_DIR,)
report_handler = subprocess.Popen(report_handler_script, executable='/bin/bash', stdin=subprocess.PIPE, shell=True)
try: