Merge branch 'open-vm-tools'

config/rootfiles/packages/openvmtools

@@ -0,0 +1,39 @@
+etc/rc.d/init.d/openvmtools
+etc/rc.d/rc0.d/K01openvmtools
+etc/rc.d/rc3.d/S60openvmtools
+etc/rc.d/rc6.d/K01openvmtools
+etc/vmware-tools
+etc/vmware-tools/plugins
+etc/vmware-tools/poweroff-vm-default
+etc/vmware-tools/poweron-vm-default
+etc/vmware-tools/resume-vm-default
+etc/vmware-tools/suspend-vm-default
+etc/vmware-tools/vm-support
+sbin/mount.vmhgfs
+usr/bin/vmtoolsd
+usr/bin/vmware-checkvm
+usr/bin/vmware-hgfsclient
+usr/bin/vmware-rpctool
+usr/bin/vmware-toolbox-cmd
+usr/bin/vmware-vmblock-fuse
+usr/bin/vmware-xferlogs
+usr/lib/libguestlib.a
+usr/lib/libguestlib.la
+usr/lib/libguestlib.so
+usr/lib/libguestlib.so.0
+usr/lib/libguestlib.so.0.0.0
+usr/lib/libvmtools.a
+usr/lib/libvmtools.la
+usr/lib/libvmtools.so
+usr/lib/libvmtools.so.0
+usr/lib/libvmtools.so.0.0.0
+usr/lib/open-vm-tools
+usr/lib/open-vm-tools/plugins
+usr/lib/open-vm-tools/plugins/vmsvc
+usr/lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
+usr/lib/open-vm-tools/plugins/vmsvc/libhgfsServer.so
+usr/lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
+usr/lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
+usr/lib/open-vm-tools/plugins/vmsvc/libvix.so
+usr/lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
+usr/sbin/mount.vmhgfs

doc/packages-list.txt

@@ -257,7 +257,7 @@
 * nut-2.4.3
 * ocaml-3.09.2
 * oinkmaster-2.0
-* open-vm-tools-2009.05.22-167859
+* open-vm-tools-8.4.2-261024
 * openldap-2.3.20
 * openmailadmin-1.0.0
 * openssh-5.4p1

lfs/openvmtools

@@ -24,13 +24,16 @@
 
 include Config
 
-VER        = 2009.05.22-167859
+VER        = 8.4.2-261024
 
 THISAPP    = open-vm-tools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = openvmtools
+PAK_VER    = 0
+DEPS       = "glib"
 
 ###############################################################################
 # Top-level Rules
@@ -40,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = cc1c139d2d927952be93397d928f9d6c
+$(DL_FILE)_MD5 = 4d9ddc865b42fc6982c3078031500486
 
 install : $(TARGET)
 
@@ -50,6 +53,8 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist:
+	@$(PAK) 
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -78,5 +83,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	   --without-kernel-modules
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+	ln -sf ../init.d/openvmtools /etc/rc.d/rc3.d/S60openvmtools
+	ln -sf ../init.d/openvmtools /etc/rc.d/rc0.d/K01openvmtools
+	ln -sf ../init.d/openvmtools /etc/rc.d/rc6.d/K01openvmtools
+	rm -rvf /usr/etc/pam.d /usr/share/openvmtools
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

make.sh

@@ -625,7 +625,7 @@ buildipfire() {
   ipfiremake perl-DBD-mysql
   ipfiremake cacti
   ipfiremake icecc
-  ipfiremake open-vm-tools
+  ipfiremake openvmtools
   ipfiremake nagiosql
   ipfiremake iftop
   ipfiremake motion

src/initscripts/init.d/openvmtools

@@ -0,0 +1,64 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/
+#
+# Description : init-script for open-vm-tools
+#
+# Authors     : earl
+#
+# Version     : 00.01
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+case "${1}" in
+	start)
+	if ps ax | grep -v grep | grep /usr/bin/vmtoolsd > /dev/null
+   		then
+		boot_mesg "vmtoolsd is running..."
+		echo_warning
+	else
+		if /usr/bin/vmware-checkvm > /dev/null 2>&1; then
+			boot_mesg "Starting..."
+			/usr/bin/vmtoolsd &
+			echo_ok
+		else
+			boot_mesg "IPFire is not running in a virtual machine." 
+			echo_failure
+		fi
+	fi
+	;;
+	
+	stop)
+	if ps ax | grep -v grep | grep /usr/bin/vmtoolsd > /dev/null
+   		then
+		boot_mesg "Stopping..."
+		killall  /usr/bin/vmtoolsd > /dev/null
+		echo_ok
+	else
+		boot_mesg "vmtoolsd is not running..."	
+		echo_warning
+	fi
+	;;
+
+	restart)
+		${0} stop
+		sleep 1
+		${0} start
+		;;
+
+	status)
+		statusproc /usr/bin/vmtoolsd
+		;;
+
+	*)
+		echo "Usage: ${0} {start|stop|restart}"
+		exit 1
+		;;
+esac
+
+# End $rc_base/init.d/