community/open-vm-tools: change default logs location to /var/log/vmware

To avoid bloating /var/log with many log files from vmtools.

5 files changed, 93 insertions, 10 deletions

diff --git a/community/open-vm-tools/APKBUILD b/community/open-vm-tools/APKBUILD
index 2df138fc32..4fc3893abd 100644
--- a/community/open-vm-tools/APKBUILD
+++ b/community/open-vm-tools/APKBUILD
@@ -72,6 +72,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/vmware/open-vm-tools/archive
 	systemLinux.c-fixup-for-Alpine.patch
 	mock-res_ninit-and-res_nclose.patch
 	fix-mount.vmhgfs-symlink.patch
+	change-default-log-dir.patch
 	tools.conf.patch
 
 	$pkgname.initd
@@ -135,6 +136,7 @@ package() {
 	install -D -m 755 "$srcdir"/$pkgname.initd ./etc/init.d/$pkgname
 	install -D -m 644 "$srcdir"/$pkgname.confd ./etc/conf.d/$pkgname
 	install -D -m 644 "$srcdir"/$pkgname.logrotate ./etc/logrotate.d/$pkgname
+	install -d -m 750 ./var/log/vmware
 
 	mkdir -p ./lib/modules-load.d/
 	cat > ./lib/modules-load.d/$pkgname.conf <<-EOF
@@ -249,7 +251,8 @@ a38bb2ac16657be9f7e9b2a5e32d23e66db1f283284c1cb8e7ffe853e047373397e60f01e735a28e
 c18280eb3fdfe1e3ecc5aa116369908c71917bd4dd49743a9abf78e0096e8d6c7d4323057cf506ef31886b893b2e4c4839656172edd5097a347efa96aea1c86c  systemLinux.c-fixup-for-Alpine.patch
 8288503c54c5a15268b1590d747d4f246fa348734ebc70f3bd56f8cec6419d032ee6bf52a7579ee088f2c80f5b0d85f050e0615d6ad6cd8da016efa2a626ce17  mock-res_ninit-and-res_nclose.patch
 dbcec24beafbbe94c8ed12482f9d0c643a6bbec256198cdc898513410271a3e2c0b7e35b0997ee0e91b1567f4ed0ecf44740b8c972dd5b2fc4bf21643653153a  fix-mount.vmhgfs-symlink.patch
-2704bd733fdbee956e6e8bf7dd5c4de314cb742185e5c0a4b781910d4e79cf9080b64496f8819d8d10711fdb159da6bfc6a7b8683edbb028ed6b4f7fe8eb5c71  tools.conf.patch
+87057ae614d34af2e5581f31b5e028363f316bce4e255b5199438bade96891e798160424aee5804314280773de98ed514fcac7a790bec1f1ae63f3daa1fbef9c  change-default-log-dir.patch
+44d4f149bdb15b364c5a11657514f432dba7d3fd35907cb58b3c47d54165f439d7775db128f8b476e9f7002d9741cb11d4cba83ce8998db003bfad761c4db710  tools.conf.patch
 d4d0c0c3042eef4d241c933de6f7c398a88275744b3576efc2f909acd681752f548e4ae4a17eca7db731ee0b9254b46169a48463d12a72ec6354065d788159f4  open-vm-tools.initd
 820ff0ed2911c63970ee7cfad4cd9ea4a0eeee000de4e87e2d231bf8816a48af3af73ad288cca0adddf9e8fed7f36c72298fe0549fe945aded33fc186a6b31dd  open-vm-tools.confd
-5626c68b8ee01ece804f314b829476280e892581a448c27092e32a60b04d40ecfa8e8eca464c4376c3cfc497eb60406798b7383d1a747a173d3cd8b78d23100b  open-vm-tools.logrotate"
+4b79d7432f366e5ef202e69bffed5caacab8008f39475d50d54cfa5ac9f521cc0df7122d8e3a95340a4b00cb0b202717293df14f9d411d5edf41dcc7fa4c0550  open-vm-tools.logrotate"
diff --git a/community/open-vm-tools/change-default-log-dir.patch b/community/open-vm-tools/change-default-log-dir.patch
new file mode 100644
index 0000000000..2a73d4f262
--- /dev/null
+++ b/community/open-vm-tools/change-default-log-dir.patch
@@ -0,0 +1,77 @@
+Group all vmtools logs in /var/log/vmware directory.
+
+--- a/open-vm-tools/libvmtools/vmtoolsLog.c
++++ b/open-vm-tools/libvmtools/vmtoolsLog.c
+@@ -79,7 +79,7 @@
+ #define DEFAULT_LOGFILE_DIR "%windir%"
+ #define DEFAULT_LOGFILE_NAME_PREFIX "vmware"
+ #else
+-// *ix log goes to /var/log/vmware-<service>.log
++// *ix log goes to /var/log/vmware/<service>.log
+ #define DEFAULT_LOGFILE_NAME_PREFIX  "/var/log/vmware"
+ #endif
+ 
+@@ -827,7 +827,7 @@
+                           domain,
+                           g_get_user_name());
+ #else
+-   path = g_strdup_printf("%s-%s-%s.log", DEFAULT_LOGFILE_NAME_PREFIX,
++   path = g_strdup_printf("%s/%s-%s.log", DEFAULT_LOGFILE_NAME_PREFIX,
+                           domain,
+                           g_get_user_name());
+ #endif
+--- a/open-vm-tools/vgauth/service/service.h
++++ b/open-vm-tools/vgauth/service/service.h
+@@ -89,7 +89,7 @@
+ #define LOGFILENAME_DEFAULT "vgauthsvclog.txt"
+ #define LOGFILENAME_PATH_DEFAULT "c:\\temp\\" LOGFILENAME_DEFAULT
+ #else
+-#define LOGFILENAME_PATH_DEFAULT "/var/log/vmware-vgauthsvc.log"
++#define LOGFILENAME_PATH_DEFAULT "/var/log/vmware/vgauthsvc.log"
+ #endif
+ 
+ void Service_SetLogOnStdout(gboolean flag);
+--- a/open-vm-tools/scripts/common/vm-support
++++ b/open-vm-tools/scripts/common/vm-support
+@@ -331,7 +331,7 @@
+ addfiles /var/log/secure*
+ addfiles /var/log/messages*
+ addfiles /var/log/syslog*
+-addfiles /var/log/vmware-*
++addfiles /var/log/vmware/*
+ addfiles /var/run/vmware-*
+ addfile /var/log/cloud-init.log
+ addfile /var/log/cloud-init-output.log
+--- open-vm-tools-stable-11.0.5.orig/open-vm-tools/scripts/linux/network
++++ open-vm-tools-stable-11.0.5/open-vm-tools/scripts/linux/network
+@@ -26,7 +26,7 @@
+ # of suspend and resume events, respectively.
+ #
+ 
+-logbase=/var/log/vmware-network
++logbase=/var/log/vmware/network
+ logfile=$logbase.log
+ 
+ #
+--- a/open-vm-tools/services/plugins/deployPkg/deployPkgLog.c
++++ b/open-vm-tools/services/plugins/deployPkg/deployPkgLog.c
+@@ -73,7 +73,7 @@
+ 
+    Str_Strcat(logPath, "vmware-imc", sizeof logPath);
+ #else
+-   Str_Strcpy(logPath, "/var/log/vmware-imc", sizeof logPath);
++   Str_Strcpy(logPath, "/var/log/vmware", sizeof logPath);
+ #endif
+ 
+    if (File_CreateDirectoryHierarchy(logPath, NULL)) {
+--- a/open-vm-tools/libDeployPkg/linuxDeployment.c
++++ b/open-vm-tools/libDeployPkg/linuxDeployment.c
+@@ -86,7 +86,7 @@
+ #endif
+ 
+ #ifndef CABCOMMANDLOG
+-#define CABCOMMANDLOG "/var/log/vmware-imc/toolsDeployPkg.log"
++#define CABCOMMANDLOG "/var/log/vmware/toolsDeployPkg.log"
+ #endif
+ 
+ #define MAXSTRING 2048
diff --git a/community/open-vm-tools/open-vm-tools.logrotate b/community/open-vm-tools/open-vm-tools.logrotate
index 79d7e67f2e..9f8e7ade17 100644
--- a/community/open-vm-tools/open-vm-tools.logrotate
+++ b/community/open-vm-tools/open-vm-tools.logrotate
@@ -1,4 +1,4 @@
-/var/log/vmware-vmsvc.log {
+/var/log/vmware/*.log {
 	copytruncate
 	delaycompress
 	missingok
diff --git a/community/open-vm-tools/open-vm-tools.post-upgrade b/community/open-vm-tools/open-vm-tools.post-upgrade
index a4cc509fb3..0fac964037 100644
--- a/community/open-vm-tools/open-vm-tools.post-upgrade
+++ b/community/open-vm-tools/open-vm-tools.post-upgrade
@@ -9,6 +9,8 @@ if [ "$(apk version -t "$ver_old" "11.0.5-r1")" = "<" ]; then
 	* All open-vm-tools plugins, except powerOps, were moved into separate
 	* packages named open-vm-tools-<plugin>. If you want to install all
 	* of them, run: apk add open-vm-tools-plugins-all.
+	*
+	* Log files produced by open-vm-tools were moved to /var/log/vmware/.
 	* 
 	EOF
 fi
diff --git a/community/open-vm-tools/tools.conf.patch b/community/open-vm-tools/tools.conf.patch
index cec79121d7..c0a084e452 100644
--- a/community/open-vm-tools/tools.conf.patch
+++ b/community/open-vm-tools/tools.conf.patch
@@ -8,8 +8,9 @@ Remove Windows-only stuff and fix default paths.
  # By default, logs go to
 -# %windir%/temp/vmware-<servicename>.log
 -# for Windows, and
- # /var/log/vmware-<servicename>-<username>.log
+-# /var/log/vmware-<servicename>-<username>.log
 -# for Linux, MacOS and Solaris.
++# /var/log/vmware/<servicename>-<username>.log
  
  # Possible values for handler are:
  # file: logs to a file. Set *.data to the file name
@@ -26,13 +27,13 @@ Remove Windows-only stuff and fix default paths.
  #vmtoolsd.level = debug
  #vmtoolsd.handler = file
 -#vmtoolsd.data = c:/tmp/vmtoolsd-${USER}.log
-+#vmtoolsd.data = /var/log/vmtoolsd-${USER}.log
++#vmtoolsd.data = /var/log/vmware/vmtoolsd-${USER}.log
  
  # Enable 'vmsvc' service logging to a file.
  #vmsvc.level = debug
  #vmsvc.handler = file
 -#vmsvc.data = c:/tmp/vmsvc.log
-+#vmsvc.data = /var/log/vmsvc.log
++#vmsvc.data = /var/log/vmware/vmsvc.log
  
  # Enable VMwareResolutionSet.exe logging to a file.
  # Comment this for Linux guest, sometimes vmusr logs are not generated due
@@ -40,24 +41,24 @@ Remove Windows-only stuff and fix default paths.
  #vmresset.level = debug
  #vmresset.handler = file+
 -#vmresset.data = c:/tmp/vmresset.log
-+#vmresset.data = /var/log/vmresset.log
++#vmresset.data = /var/log/vmware/vmresset.log
  
  # Enable new "vmusr" service logging to a file.
  #vmusr.level = debug
  #vmusr.handler = file
 -#vmusr.data = c:/tmp/vmusr.${USER}.log
-+#vmusr.data = /var/log/vmusr.${USER}.log
++#vmusr.data = /var/log/vmware/vmusr.${USER}.log
  
  # Set the following configuration if you want to collect the logs for
  # vmware-toolbox-cmd utility
  #toolboxcmd.level = debug
  #toolboxcmd.handler = file
 -#toolboxcmd.data = c:/tmp/vmtoolboxcmd-${USER}.log
-+#toolboxcmd.data = /var/log/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/vmtools.log
++#log.file = /var/log/vmware/vmtools.log
  
  # Enable "hgfsServer" request handling logging to the appropriate service file.
  #hgfsServer.level = debug