hardcode openvpn binary for bundle

1 files changed, 7 insertions, 29 deletions

diff --git a/src/leap/bitmask/services/eip/linuxvpnlauncher.py b/src/leap/bitmask/services/eip/linuxvpnlauncher.py
index 791c318c..6d54c27b 100644
--- a/src/leap/bitmask/services/eip/linuxvpnlauncher.py
+++ b/src/leap/bitmask/services/eip/linuxvpnlauncher.py
@@ -100,41 +100,19 @@ leapfile = lambda f: "%s/%s" % (SYSTEM_CONFIG, f)
 
 class LinuxVPNLauncher(VPNLauncher):
     PKEXEC_BIN = 'pkexec'
-
-    # FIXME should get the absolute path to openvpn. See #5592
-    OPENVPN_BIN = 'openvpn'
     BITMASK_ROOT = "/usr/sbin/bitmask-root"
 
-    # FIXME get ABSOLUTE PATH
-    OPENVPN_BIN_PATH = os.path.join(
-        get_path_prefix(), "..", "apps", "eip", OPENVPN_BIN)
-
     # We assume this is there by our openvpn dependency, and
     # we will put it there on the bundle too.
-    # TODO adapt to the bundle path.
-    OPENVPN_DOWN_ROOT_BASE = "/usr/lib/openvpn/"
-    OPENVPN_DOWN_ROOT_FILE = "openvpn-plugin-down-root.so"
-    OPENVPN_DOWN_ROOT_PATH = "%s/%s" % (
-        OPENVPN_DOWN_ROOT_BASE,
-        OPENVPN_DOWN_ROOT_FILE)
-
-    # XXX Should be able to pick the right resolvconf script
-    # on the fly.
-    RESOLV_UPDATE_FILE = "resolv-update"
-    RESOLV_UPDATE_SCRIPT = leapfile(RESOLV_UPDATE_FILE)
-
-    RESOLVCONF_FILE = "update-resolv-conf"
-    RESOLVCONF_SCRIPT = leapfile(RESOLVCONF_FILE)
-
-    UP_SCRIPT = RESOLVCONF_SCRIPT
-    DOWN_SCRIPT = RESOLVCONF_SCRIPT
-
-    UPDOWN_FILES = (UP_SCRIPT, DOWN_SCRIPT)
+    if flags.STANDALONE:
+        OPENVPN_BIN_PATH = "/usr/sbin/leap-openvpn"
+    else:
+        OPENVPN_BIN_PATH = "/usr/sbin/openvpn"
 
-    # XXX GET BOTH POLKIT FILES: the one for vpn and the other for the wrapper
     POLKIT_PATH = LinuxPolicyChecker.get_polkit_path()
-    OTHER_FILES = (POLKIT_PATH, RESOLV_UPDATE_SCRIPT, RESOLVCONF_SCRIPT,
-                   BITMASK_ROOT)
+
+    # XXX openvpn binary TOO
+    OTHER_FILES = (POLKIT_PATH, BITMASK_ROOT)
 
     @classmethod
     def maybe_pkexec(kls):