summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/vpn/launchers
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2017-02-01 16:55:51 +0100
committerKali Kaneko (leap communications) <kali@leap.se>2017-02-23 00:40:33 +0100
commitb509a5f353f706fab31189b352d6ffa24bd1c3e5 (patch)
treeb718ec49865195926d6809d6c5ba680f89c9e6e4 /src/leap/bitmask/vpn/launchers
parentef57df5a4791f81871f2da42c1bb3086d0ed0815 (diff)
[bug] fix bitmask-root path
Diffstat (limited to 'src/leap/bitmask/vpn/launchers')
-rw-r--r--src/leap/bitmask/vpn/launchers/linux.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/leap/bitmask/vpn/launchers/linux.py b/src/leap/bitmask/vpn/launchers/linux.py
index d39b3b13..f99c5c78 100644
--- a/src/leap/bitmask/vpn/launchers/linux.py
+++ b/src/leap/bitmask/vpn/launchers/linux.py
@@ -59,8 +59,14 @@ class LinuxVPNLauncher(VPNLauncher):
class BITMASK_ROOT(object):
def __call__(self):
- return ("/usr/local/sbin/bitmask-root" if flags_STANDALONE else
- "/usr/sbin/bitmask-root")
+ _global = '/usr/sbin/bitmask-root'
+ _local = '/usr/local/sbin/bitmask-root'
+ if os.path.isfile(_global):
+ return _global
+ elif os.path.isfile(_local):
+ return _local
+ else:
+ return 'bitmask-root'
class OPENVPN_BIN_PATH(object):
def __call__(self):