diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-16 13:54:38 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-16 13:54:38 -0300 |
| commit | 2f72be8de2bf049f4e3185f6c0724a24ae4552cc (patch) | |
| tree | 70ab7d27cc4d76e9d265c0fcdeda2866ffa356b6 | |
| parent | 4f8ddf9978cee13f22635fd3d1e42b190ca838b3 (diff) | |
| parent | 4dc8562400a5d06ce0fa43fa317bc619f9cdd9ae (diff) | |
Merge remote-tracking branch 'kali/bug/move_down_setenv_flag' into develop
| -rw-r--r-- | src/leap/bitmask/services/eip/vpnlaunchers.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/leap/bitmask/services/eip/vpnlaunchers.py b/src/leap/bitmask/services/eip/vpnlaunchers.py index 31a1c17b..fb9ac46f 100644 --- a/src/leap/bitmask/services/eip/vpnlaunchers.py +++ b/src/leap/bitmask/services/eip/vpnlaunchers.py @@ -402,15 +402,15 @@ class LinuxVPNLauncher(VPNLauncher): openvpn = first(openvpn_possibilities) args = [] - args += [ - '--setenv', "LEAPOPENVPN", "1" - ] - pkexec = self.maybe_pkexec() if pkexec: args.append(openvpn) openvpn = first(pkexec) + args += [ + '--setenv', "LEAPOPENVPN", "1" + ] + if openvpn_verb is not None: args += ['--verb', '%d' % (openvpn_verb,)] |