CVS commit: pkgsrc/sysutils/open-vm-tools

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri May 10 07:31:46 UTC 2024

Modified Files:
        pkgsrc/sysutils/open-vm-tools: Makefile
        pkgsrc/sysutils/open-vm-tools/files: vmtools.sh

Log Message:
sysutils/open-vm-tools: kern/58195: Detach NetBSD vmt(4) before starting vmtoolsd

On NetBSD/aarch64 this currently only works on -CURRENT, but doing this on
older kernels is at least harmless because drvctl requests are simply
rejected. On any other OSes this should change nothing.


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 pkgsrc/sysutils/open-vm-tools/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/files/vmtools.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/open-vm-tools/Makefile
diff -u pkgsrc/sysutils/open-vm-tools/Makefile:1.127 pkgsrc/sysutils/open-vm-tools/Makefile:1.128
--- pkgsrc/sysutils/open-vm-tools/Makefile:1.127        Tue Apr  9 01:12:36 2024
+++ pkgsrc/sysutils/open-vm-tools/Makefile      Fri May 10 07:31:46 2024
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.127 2024/04/09 01:12:36 pho Exp $
+# $NetBSD: Makefile,v 1.128 2024/05/10 07:31:46 pho Exp $
 
 OVTVER=                12.4.0
 DISTNAME=      open-vm-tools-${OVTVER}-23259341
 PKGNAME=       open-vm-tools-${OVTVER}
+PKGREVISION=   1
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=vmware/}
 GITHUB_RELEASE=        stable-${OVTVER}

Index: pkgsrc/sysutils/open-vm-tools/files/vmtools.sh
diff -u pkgsrc/sysutils/open-vm-tools/files/vmtools.sh:1.3 pkgsrc/sysutils/open-vm-tools/files/vmtools.sh:1.4
--- pkgsrc/sysutils/open-vm-tools/files/vmtools.sh:1.3  Fri Feb 17 21:58:09 2023
+++ pkgsrc/sysutils/open-vm-tools/files/vmtools.sh      Fri May 10 07:31:46 2024
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: vmtools.sh,v 1.3 2023/02/17 21:58:09 khorben Exp $
+# $NetBSD: vmtools.sh,v 1.4 2024/05/10 07:31:46 pho Exp $
 #
 
 # PROVIDE: vmtools
@@ -14,5 +14,20 @@ pidfile="/var/run/vmware-guestd.pid"
 command="@PREFIX@/bin/vmtoolsd"
 command_args="--background ${pidfile}"
 
+start_precmd="disable_vmt"
+disable_vmt()
+{
+       # Attempt to detach NetBSD vmt(4) driver so that it won't conflict
+       # with vmtoolsd.
+       drvctl -d vmt0 >/dev/null 2>&1 || true
+}
+
+stop_precmd="enable_vmt"
+enable_vmt()
+{
+       # Attempt to re-attach NetBSD vmt(4) driver.
+       drvctl -r -a cpufeaturebus cpu0 >/dev/null 2>&1 || true
+}
+
 load_rc_config $name
 run_rc_command "$1"