From c6aa892a8053856c65979b9bd9a86fde67bf47bc Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 6 Sep 2018 13:33:20 +0200 Subject: get openvpn from snap --- src/leap/bitmask/vpn/helpers/linux/bitmask-root | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/leap/bitmask/vpn/helpers/linux/bitmask-root b/src/leap/bitmask/vpn/helpers/linux/bitmask-root index 8f9deb54..e69edf44 100755 --- a/src/leap/bitmask/vpn/helpers/linux/bitmask-root +++ b/src/leap/bitmask/vpn/helpers/linux/bitmask-root @@ -364,13 +364,13 @@ def get_openvpn_bin(): Return the path for either the system openvpn or the one the bundle has put there. """ + if os.environ.get('SNAP') and if os.path.isfile(OPENVPN_SNAP_BIN): + # the snap option should be removed from the debian package. + return OPENVPN_SNAP_BIN + if os.path.isfile(OPENVPN_SYSTEM_BIN): return OPENVPN_SYSTEM_BIN - # the snap option should be removed from the debian package. - if os.path.isfile(OPENVPN_SNAP_BIN): - return OPENVPN_SNAP_BIN - # the bundle option should also be removed from the debian. if os.path.isfile(OPENVPN_LEAP_BIN): return OPENVPN_LEAP_BIN @@ -780,7 +780,7 @@ def firewall_start(args): elif QUBES_VER == 3: run("systemctl", "restart", "qubes-firewall.service") - toggle_ipv6('disable') + # toggle_ipv6('disable') def firewall_stop(): @@ -860,7 +860,7 @@ def firewall_stop(): "chain (maybe it is already destroyed?)", exc) ok = False - toggle_ipv6('enable') + # toggle_ipv6('enable') if not (ok or ipv4_chain_exists or ipv6_chain_exists): raise Exception("firewall might still be left up. " -- cgit v1.2.3