summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/platform_init
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2014-09-12 13:30:42 -0500
committerRuben Pollan <meskio@sindominio.net>2014-09-12 13:42:19 -0500
commitf9ed736e41aa63b60925802fad021fc387dbc303 (patch)
treebda0c979f7563963e869282943d00e3a88c7cd4e /src/leap/bitmask/platform_init
parentaacc94aac0f824bb1c292a1cddbbe1a6a0cd4d39 (diff)
Initializers needs to use PolicyChecker to get pkexec in linux
Diffstat (limited to 'src/leap/bitmask/platform_init')
-rw-r--r--src/leap/bitmask/platform_init/initializers.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/bitmask/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py
index 70d787dd..1d6bb1d0 100644
--- a/src/leap/bitmask/platform_init/initializers.py
+++ b/src/leap/bitmask/platform_init/initializers.py
@@ -29,9 +29,9 @@ from PySide import QtGui, QtCore
from leap.bitmask.config import flags
from leap.bitmask.config.leapsettings import LeapSettings
from leap.bitmask.services.eip import get_vpn_launcher
-from leap.bitmask.services.eip.linuxvpnlauncher import LinuxVPNLauncher
from leap.bitmask.services.eip.darwinvpnlauncher import DarwinVPNLauncher
from leap.bitmask.util import first
+from leap.bitmask.util.privilege_policies import LinuxPolicyChecker
logger = logging.getLogger(__name__)
@@ -445,7 +445,6 @@ def _linux_install_missing_scripts(badexec, notfound):
success = False
installer_path = os.path.abspath(
os.path.join(os.getcwd(), "apps", "eip", "files"))
- launcher = LinuxVPNLauncher
install_helper = "leap-install-helper.sh"
install_helper_path = os.path.join(installer_path, install_helper)
@@ -456,7 +455,8 @@ def _linux_install_missing_scripts(badexec, notfound):
if os.path.isdir(installer_path):
try:
- pkexec = first(launcher.maybe_pkexec())
+ policyChecker = LinuxPolicyChecker()
+ pkexec = first(policyChecker.maybe_pkexec())
cmdline = ["%s %s %s" % (
pkexec, install_helper_path, install_opts)]