diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-07-08 14:08:57 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-07-08 14:08:57 -0300 |
| commit | 4793149d6d1276feaabcc89b90f209dc70355b20 (patch) | |
| tree | 3030a7cf11356b1e293a814d61519e362f6b6183 | |
| parent | a5baed41d819cbdabc5209b1ccd0f048845279c4 (diff) | |
| parent | 076cbbef6edf9d6dc8145f31d0803941d5ad6605 (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/feature/add-fingerprint-gui-polkit-support' into develop
| -rw-r--r-- | changes/feature-5880_add-fingerprint-gui-polkit-support | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/services/eip/linuxvpnlauncher.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changes/feature-5880_add-fingerprint-gui-polkit-support b/changes/feature-5880_add-fingerprint-gui-polkit-support new file mode 100644 index 00000000..c71093d5 --- /dev/null +++ b/changes/feature-5880_add-fingerprint-gui-polkit-support @@ -0,0 +1 @@ +- Add support for fingerprint-gui's polkit agent. Closes #5880. diff --git a/src/leap/bitmask/services/eip/linuxvpnlauncher.py b/src/leap/bitmask/services/eip/linuxvpnlauncher.py index 8ec0c050..1409d504 100644 --- a/src/leap/bitmask/services/eip/linuxvpnlauncher.py +++ b/src/leap/bitmask/services/eip/linuxvpnlauncher.py @@ -74,6 +74,7 @@ def _is_auth_agent_running(): 'ps aux | grep "polkit-[m]ate-authentication-agent-1"', 'ps aux | grep "[l]xpolkit"', 'ps aux | grep "[g]nome-shell"', + 'ps aux | grep "[f]ingerprint-polkit-agent"', ] is_running = [commands.getoutput(cmd) for cmd in polkit_options] |