diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-26 11:16:43 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-26 11:16:43 -0300 |
| commit | 2f6ad4211ccee12b577f78ff84a6d1d36d95b724 (patch) | |
| tree | a4f0b4430926dea7c75e69ea8b3ed9bde5d35b7f | |
| parent | 6259826db4418be0bf05fee4785997575abe8177 (diff) | |
| parent | 4d9525be291df0bd5679f9c1247686693161ccf8 (diff) | |
Merge remote-tracking branch 'kali/bug/3450_fix-up-script' into develop
| -rw-r--r-- | changes/bug_3450-fix-up-script | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/services/eip/vpnlaunchers.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changes/bug_3450-fix-up-script b/changes/bug_3450-fix-up-script new file mode 100644 index 00000000..39b3638e --- /dev/null +++ b/changes/bug_3450-fix-up-script @@ -0,0 +1 @@ + o Fix up script in non-bundle linuces. Closes: #3450 diff --git a/src/leap/bitmask/services/eip/vpnlaunchers.py b/src/leap/bitmask/services/eip/vpnlaunchers.py index fb9ac46f..f8c51ad8 100644 --- a/src/leap/bitmask/services/eip/vpnlaunchers.py +++ b/src/leap/bitmask/services/eip/vpnlaunchers.py @@ -343,7 +343,7 @@ class LinuxVPNLauncher(VPNLauncher): abs_path_in_bundle = os.path.join(cwd, rel_path_in_bundle) if os.path.isfile(abs_path_in_bundle): return abs_path_in_bundle - abs_path_in_system = kls.OPENVPN_DOWN_ROOT_FILE + abs_path_in_system = kls.OPENVPN_DOWN_ROOT_PATH if os.path.isfile(abs_path_in_system): return abs_path_in_system |