diff options
| author | Runar Borge <runar@borge.nu> | 2019-01-01 23:37:16 +0100 |
|---|---|---|
| committer | Runar Borge <runar@borge.nu> | 2019-01-01 23:37:16 +0100 |
| commit | a47e9599b48e5402a1b14228cf6e019078116365 (patch) | |
| tree | a2665e2754449bc7b8800ffc10c468b19b56acca /data | |
| parent | b66718a87b2599e34945000d2301959cce90152a (diff) | |
| parent | 23e35e77feca41b5ef0efee80832c7106d7862ab (diff) | |
| download | vyos-build-a47e9599b48e5402a1b14228cf6e019078116365.tar.gz vyos-build-a47e9599b48e5402a1b14228cf6e019078116365.zip | |
Merge remote-tracking branch 'upstream/current' into current
Diffstat (limited to 'data')
| -rw-r--r-- | data/kernel_version | 1 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/30-openvmtools-configs.chroot | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/data/kernel_version b/data/kernel_version new file mode 100644 index 00000000..aca0bf9d --- /dev/null +++ b/data/kernel_version @@ -0,0 +1 @@ +4.19.12 diff --git a/data/live-build-config/hooks/live/30-openvmtools-configs.chroot b/data/live-build-config/hooks/live/30-openvmtools-configs.chroot new file mode 100755 index 00000000..545f40db --- /dev/null +++ b/data/live-build-config/hooks/live/30-openvmtools-configs.chroot @@ -0,0 +1,19 @@ +#!/usr/bin/env python + +# The Cisco Unity plugin, that implements a proprietary extension +# for IPsec split tunneling, interfers with DMVPN +# +# Since we do not do remote access IPsec, the simplest solution +# is to disable it entirely from the start. + +import re + +vmtools_config = """ +[guestinfo] + poll-interval=0 + +""" + +# Disable the 'cisco_unity' option in charon.conf +with open('/etc/vmware-tools/tools.conf', 'w') as f: + f.write(vmtools_config) |