diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-04-08 15:25:58 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-04-08 15:25:58 -0300 |
| commit | e11edcca2ec95ec267d64c1f22390a3eb1b47bf5 (patch) | |
| tree | c7ab15b6411492e646077cd4aa55bc2e521f48b5 | |
| parent | 3908b8abfc0d409b2a4388c8df30429bbdada6c0 (diff) | |
| parent | c68ebd49ba82b2594be0291a881fe44bb1502552 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/feature/support-mate-polkit-agent' into develop
| -rw-r--r-- | changes/feature_support-mate-polkit-agent | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/services/eip/linuxvpnlauncher.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changes/feature_support-mate-polkit-agent b/changes/feature_support-mate-polkit-agent new file mode 100644 index 00000000..70ceb567 --- /dev/null +++ b/changes/feature_support-mate-polkit-agent @@ -0,0 +1 @@ +- Add support for Mate's polkit agent. diff --git a/src/leap/bitmask/services/eip/linuxvpnlauncher.py b/src/leap/bitmask/services/eip/linuxvpnlauncher.py index d24e7ae7..8747daa6 100644 --- a/src/leap/bitmask/services/eip/linuxvpnlauncher.py +++ b/src/leap/bitmask/services/eip/linuxvpnlauncher.py @@ -66,6 +66,7 @@ def _is_auth_agent_running(): polkit_options = [ 'ps aux | grep polkit-[g]nome-authentication-agent-1', 'ps aux | grep polkit-[k]de-authentication-agent-1', + 'ps aux | grep polkit-[m]ate-authentication-agent-1', 'ps aux | grep [l]xpolkit' ] is_running = [commands.getoutput(cmd) for cmd in polkit_options] |