From owner-svn-ports-all@freebsd.org Fri Mar 24 14:43:26 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 22ADAD19210; Fri, 24 Mar 2017 14:43:26 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D77CA1365; Fri, 24 Mar 2017 14:43:25 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2OEhOhg044321; Fri, 24 Mar 2017 14:43:24 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2OEhOkX044318; Fri, 24 Mar 2017 14:43:24 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201703241443.v2OEhOkX044318@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 24 Mar 2017 14:43:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436816 - in head/emulators/open-vm-tools: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2017 14:43:26 -0000 Author: swills Date: Fri Mar 24 14:43:24 2017 New Revision: 436816 URL: https://svnweb.freebsd.org/changeset/ports/436816 Log: emulators/open-vm-tools: improve scripts Make it possible to disable the rc scripts. Still default to enabled, but only when checkvm says we are in a VM. While here, improve scripts slightly. Requested by: mat Tested by: mat Modified: head/emulators/open-vm-tools/Makefile head/emulators/open-vm-tools/files/vmware-guestd.in head/emulators/open-vm-tools/files/vmware-kmod.in head/emulators/open-vm-tools/pkg-plist Modified: head/emulators/open-vm-tools/Makefile ============================================================================== --- head/emulators/open-vm-tools/Makefile Fri Mar 24 14:38:48 2017 (r436815) +++ head/emulators/open-vm-tools/Makefile Fri Mar 24 14:43:24 2017 (r436816) @@ -3,6 +3,7 @@ PORTNAME= open-vm-tools PORTVERSION= ${RELEASE_VER} +PORTREVISION= 1 PORTEPOCH= 2 MASTER_SITES= https://github.com/vmware/open-vm-tools/files/590760/ DISTNAME= open-vm-tools-${RELEASE_VER}-${BUILD_VER} @@ -92,9 +93,5 @@ post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/tests/ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.conf.d - ${ECHO} 'vmware_guest_vmblock_enable="yes"' > ${STAGEDIR}${PREFIX}/etc/rc.conf.d/vmware_guest_vmblock - ${ECHO} 'vmware_guest_vmmemctl_enable="yes"' > ${STAGEDIR}${PREFIX}/etc/rc.conf.d/vmware_guest_vmmemctl - ${ECHO} 'vmware_guest_vmxnet_enable="yes"' > ${STAGEDIR}${PREFIX}/etc/rc.conf.d/vmware_guest_vmxnet - ${ECHO} 'vmware_guestd_enable="yes"' > ${STAGEDIR}${PREFIX}/etc/rc.conf.d/vmware_guestd .include Modified: head/emulators/open-vm-tools/files/vmware-guestd.in ============================================================================== --- head/emulators/open-vm-tools/files/vmware-guestd.in Fri Mar 24 14:38:48 2017 (r436815) +++ head/emulators/open-vm-tools/files/vmware-guestd.in Fri Mar 24 14:43:24 2017 (r436816) @@ -4,26 +4,33 @@ # # PROVIDE: vmware-guestd -# REQUIRE: DAEMON netif +# REQUIRE: FILESYSTEMS # BEFORE: LOGIN -. /etc/rc.subr +# Add these lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# vmware_guestd_enable (bool): Set to YES by default. +# Set it to NO to disable vmware_guestd. -# Global -checkvm_cmd="%%PREFIX%%/bin/vmware-checkvm > /dev/null" +. /etc/rc.subr -# VMware guest daemon name="vmware_guestd" rcvar=vmware_guestd_enable -start_precmd="${checkvm_cmd}" -unset start_cmd -stop_precmd="${checkvm_cmd}" -unset stop_cmd + +load_rc_config $name + +checkvm_cmd="%%PREFIX%%/bin/vmware-checkvm > /dev/null" +if ${checkvm_cmd} > /dev/null ; then + : ${vmware_guestd_enable:="YES"} +else + : ${vmware_guestd_enable:="NO"} +fi + command="%%PREFIX%%/bin/vmtoolsd" -command_args="-c %%PREFIX%%/share/vmware-tools/tools.conf -p %%PREFIX%%/lib/open-vm-tools/plugins/vmsvc" pidfile="/var/run/${name}.pid" +start_precmd="${checkvm_cmd}" +stop_precmd="${checkvm_cmd}" +command_args="--background ${pidfile} -c %%PREFIX%%/share/vmware-tools/tools.conf -p %%PREFIX%%/lib/open-vm-tools/plugins/vmsvc" -load_rc_config $name -[ -z "$vmware_guestd_enable" ] && vmware_guestd_enable="YES" -[ -z "$vmware_guestd_flags" ] && vmware_guestd_flags="--background ${pidfile}" run_rc_command "$1" Modified: head/emulators/open-vm-tools/files/vmware-kmod.in ============================================================================== --- head/emulators/open-vm-tools/files/vmware-kmod.in Fri Mar 24 14:38:48 2017 (r436815) +++ head/emulators/open-vm-tools/files/vmware-kmod.in Fri Mar 24 14:43:24 2017 (r436816) @@ -51,8 +51,8 @@ stop_precmd="${checkvm_cmd}" stop_cmd=":" load_rc_config $name -[ -z "$vmware_guest_vmmemctl_enable" ] && vmware_guest_vmmemctl_enable="NO" -[ -n "$vmware_guest_kmod_enable" ] && vmware_guest_vmmemctl_enable="$vmware_guest_kmod_enable" +: ${vmware_guest_kmod_enable:="YES"} +: ${vmware_guest_vmmemctl_enable:=$vmware_guest_kmod_enable} run_rc_command "$1" # VMware kernel module: vmxnet @@ -67,7 +67,7 @@ stop_precmd="${checkvm_cmd}" stop_cmd=":" load_rc_config $name -[ -z "$vmware_guest_vmxnet_enable" ] && vmware_guest_vmxnet_enable="NO" +: ${vmware_guest_vmxnet_enable:=$vmware_guest_kmod_enable} run_rc_command "$1" # VMware kernel module: vmblock @@ -82,5 +82,5 @@ stop_precmd="${checkvm_cmd}" stop_cmd=":" load_rc_config $name -[ -z "$vmware_guest_vmblock_enable" ] && vmware_guest_vmblock_enable="NO" +: ${vmware_guest_vmblock_enable:=$vmware_guest_kmod_enable} run_rc_command "$1" Modified: head/emulators/open-vm-tools/pkg-plist ============================================================================== --- head/emulators/open-vm-tools/pkg-plist Fri Mar 24 14:38:48 2017 (r436815) +++ head/emulators/open-vm-tools/pkg-plist Fri Mar 24 14:43:24 2017 (r436816) @@ -57,10 +57,6 @@ share/vmware-tools/vm-support @rmtry share/vmware-tools/tools.conf @rmtry etc/vmware-tools/plugins etc/pam.d/vmtoolsd -etc/rc.conf.d/vmware_guest_vmblock -etc/rc.conf.d/vmware_guest_vmmemctl -etc/rc.conf.d/vmware_guest_vmxnet -etc/rc.conf.d/vmware_guestd @dir %%DATADIR%%/scripts/vmware @dir %%DATADIR%%/tests @preunexec %%PREFIX%%/bin/vmware-rpctool 'tools.set.version 0' ; service vmware-guestd stop ; true