From b008bf22e1ec2392be16830064fe538d69b8fe41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Mon, 12 Aug 2013 13:17:37 -0300 Subject: Use /Library instead of /System/Library to install tun.kext --- changes/bug_load_kext | 2 ++ src/leap/platform_init/initializers.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 changes/bug_load_kext diff --git a/changes/bug_load_kext b/changes/bug_load_kext new file mode 100644 index 00000000..ba4a44cf --- /dev/null +++ b/changes/bug_load_kext @@ -0,0 +1,2 @@ + o OSX: Check for the tun.kext existence in /Library/Extensions + instead of /System/Library/Extensions. Fixes #3271. \ No newline at end of file diff --git a/src/leap/platform_init/initializers.py b/src/leap/platform_init/initializers.py index 46488250..81fc002b 100644 --- a/src/leap/platform_init/initializers.py +++ b/src/leap/platform_init/initializers.py @@ -223,8 +223,8 @@ def _darwin_has_tun_kext(): """ # XXX we should be smarter here and use kextstats output. - has_kext = os.path.isdir("/System/Library/Extensions/tun.kext") - has_startup = os.path.isdir("/System/Library/StartupItems/tun") + has_kext = os.path.isdir("/Library/Extensions/tun.kext") + has_startup = os.path.isdir("/Library/StartupItems/tun") has_tun_and_startup = has_kext and has_startup logger.debug( 'platform initializer check: has tun_and_startup = %s' % -- cgit v1.2.3