diff options
Diffstat (limited to 'community/open-vm-tools/tools.conf.patch')
| -rw-r--r-- | community/open-vm-tools/tools.conf.patch | 101 |
1 files changed, 49 insertions, 52 deletions
diff --git a/community/open-vm-tools/tools.conf.patch b/community/open-vm-tools/tools.conf.patch index 6b5eafa92e8..2f1a74b75f6 100644 --- a/community/open-vm-tools/tools.conf.patch +++ b/community/open-vm-tools/tools.conf.patch @@ -2,6 +2,7 @@ From: Jakub Jirutka <jakub@jirutka.cz> Date: Sat, 7 Mar 2020 22:30:30 +0100 Subject: [PATCH] Remove Windows-only stuff and fix default paths +diff --git a/open-vm-tools/tools.conf b/open-vm-tools/tools.conf --- a/open-vm-tools/tools.conf +++ b/open-vm-tools/tools.conf @@ -67,10 +67,7 @@ @@ -24,7 +25,7 @@ Subject: [PATCH] Remove Windows-only stuff and fix default paths # If handler is 'syslog' and the OS is Linux, the facility # can be set with <domain>.facility. The facility value can be one of -@@ -99,33 +95,33 @@ +@@ -99,30 +95,30 @@ # Enable tools service logging to a file. #vmtoolsd.level = debug #vmtoolsd.handler = file @@ -58,13 +59,9 @@ Subject: [PATCH] Remove Windows-only stuff and fix default paths -#toolboxcmd.data = c:/tmp/vmtoolboxcmd-${USER}.log +#toolboxcmd.data = /var/log/vmware/vmtoolboxcmd-${USER}.log - # Enable old VMwareUser/vmware-user logging to file. --#log.file = c:/tmp/vmtools.log -+#log.file = /var/log/vmware/vmtools.log - - # Enable "hgfsServer" request handling logging to the appropriate service file. - #hgfsServer.level = debug -@@ -160,18 +156,11 @@ + # With no explicit logging configuration for deployPkg, its default log path in + # Linux is /var/log/vmware-imc/toolsDeployPkg.log, and in Windows is +@@ -188,18 +184,11 @@ #poweroff-script=poweroff-vm-default # Runs when the virtual machine is resumed after it was suspended. @@ -85,16 +82,16 @@ Subject: [PATCH] Remove Windows-only stuff and fix default paths #suspend-script=suspend-vm-default [guestinfo] -@@ -205,8 +194,6 @@ +@@ -233,8 +222,6 @@ # Interface names can use wildcards like '*' and '?'. # Default for Linux and all non-Windows: - #exclude-nics=veth*,docker*,virbr* + #exclude-nics=veth*,docker*,virbr*,antrea-*,cali* -# Default for Windows: -#exclude-nics=vEthernet* # max umber of IPv4 routes to gather. #max-ipv4-routes=100 -@@ -238,25 +225,10 @@ +@@ -333,25 +320,10 @@ # Set to true to disable the servicediscovery plugin. #disabled=false @@ -120,70 +117,70 @@ Subject: [PATCH] Remove Windows-only stuff and fix default paths #enable=true [guestosinfo] -@@ -269,12 +241,8 @@ - - [vmbackup] - --# enableSyncDriver is not available for Windows: +@@ -367,16 +339,12 @@ + # enableSyncDriver is Linux only. #enableSyncDriver=true --# enableVSS is Windows only: +-# enableVSS is Windows only. -#enableVSS=true - + # vss.disableAppQuiescing is Windows only. + # This setting can be used to force file system quiescing on Windows systems + # having problems with application quiescing. # See https://kb.vmware.com/s/article/2146204 - # can be used to fallback to FS quiescing forcely when there are app quiescing - # problems for specific Windows systems -@@ -283,31 +251,18 @@ - #execScripts=true - #scriptArg= + #vss.disableAppQuiescing=false -# Linux: # The value of excludedFileSystems is a comma-separated list of glob-style - # patterns specifying the file systems to be excluded from quiesced snapshots. - # The patterns may use '*' (wildcard) to represent any string of characters - # and '?" (joker) to represent any single character. Note that the characters - # represented by these patters, '*' and '?" may include any characters, - # including '/' --# + # patterns specifying the file system mount points to be excluded from + # quiescing operation. The patterns may use '*' (wildcard) to represent +@@ -384,14 +352,6 @@ + # The characters represented by the patterns '*' and '?' may include any + # characters, including '/'. + # -# Windows: -# The value of excludedFileSystems is a comma-separated list of mount points -# specifying the volumes to be excluded from quiesced snapshots. -# Each mount point must be a full path separated and ended with "\\". --# to exclude volumes with drive letter E and mount point F:\mount\, set below --# excludedFileSystems= E:\\,F:\\mount\\ --# This option only applies when app quiescing doesn't take effect. +-# For example, to exclude volumes with drive letter 'E' or mount point +-# "F:\mount\", use: +-# excludedFileSystems=E:\\,F:\\mount\\ +-# This setting is ignored when application quiescing is used. #excludedFileSystems= - # Whether to execute scripts on quiescing. --# Scripts are executed from /etc/vmware-tools/backupScripts.d on Linux and --# %installpath%\backupScripts.d on Windows, and the legacy scripts --# "c:\windows\pre-freeze-script.bat" --# "c:\windows\post-thaw-script.bat" --# --# Linux: -+# Scripts are executed from /etc/vmware-tools/backupScripts.d, -+# and the legacy scripts: - # "/usr/sbin/pre-freeze-script" - # "/usr/sbin/post-thaw-script" +@@ -401,11 +361,9 @@ + # + # Scripts directory: + # Linux: /etc/vmware-tools/backupScripts.d +-# Windows: <Install-Path>\backupScripts.d # -@@ -327,19 +282,6 @@ + # Legacy scripts: + # Linux: /usr/sbin/pre-freeze-script and /usr/sbin/post-thaw-script +-# Windows: C:\windows\pre-freeze-script.bat and C:\windows\post-thaw-script.bat + # + # On each quiescing operation, scripts are invoked before quiescing and + # either after a quiescing failure or after thawing. +@@ -433,22 +391,6 @@ + # Whether to use vgauth for guest op authentication #useVGAuth=true - --[autoupgrade] - --# The autoupgrade plugin is only available for Windows. +-[autoupgrade] - -# The "allow-upgrade" option controls whether automatic upgrades (or reinstalls) --# are allowed. The two options "allow-add-feature" and "allow-remove-feature" --# control whether adding or removing a feature will be allowed. The two latter --# ones only affect Windows tools. -- +-# are allowed. -#allow-upgrade=true +- +-# The autoupgrade plugin is only available for Windows. +-# The "allow-add-feature" and "allow-remove-feature" control whether adding +-# or removing a feature will be allowed. +-# The allow-msi-transforms option controls whether TRANSFORMS property is +-# allowed. +- -#allow-add-feature=true -#allow-remove-feature=true -- +-#allow-msi-transforms=false + [deployPkg] - # to disable guest customization |