diff options
| author | Kali Kaneko <kali@leap.se> | 2013-08-12 18:32:50 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-08-12 18:32:50 +0200 |
| commit | 25f09f2fb9031a3f7cdf1d960f47fd52fe08a064 (patch) | |
| tree | 9a0262f34116563d363854608871d3e05ae79d24 | |
| parent | 00d98a47c60764475d97df1c2eb847e20a77cae5 (diff) | |
| parent | b008bf22e1ec2392be16830064fe538d69b8fe41 (diff) | |
Merge remote-tracking branch 'chiiph/bug/3271_load_tunkext' into develop
| -rw-r--r-- | changes/bug_load_kext | 2 | ||||
| -rw-r--r-- | src/leap/platform_init/initializers.py | 4 |
2 files changed, 4 insertions, 2 deletions
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' % |