community/open-vm-tools: remove deprecated/unused stuff from init script

3 files changed, 27 insertions, 47 deletions

diff --git a/community/open-vm-tools/APKBUILD b/community/open-vm-tools/APKBUILD
index d330510828..0e2cf61007 100644
--- a/community/open-vm-tools/APKBUILD
+++ b/community/open-vm-tools/APKBUILD
@@ -263,6 +263,6 @@ dbcec24beafbbe94c8ed12482f9d0c643a6bbec256198cdc898513410271a3e2c0b7e35b0997ee0e
 87057ae614d34af2e5581f31b5e028363f316bce4e255b5199438bade96891e798160424aee5804314280773de98ed514fcac7a790bec1f1ae63f3daa1fbef9c  change-default-log-dir.patch
 6494fe94f332706a130dd12afa18b881f6b6c4e0523570ff866e1678e37af6bd6148c4cf7d957e12f8dc2a51b4f07aa849c4e947911bcbe20d0c81049a2b6974  change-statechange.subr-location.patch
 44d4f149bdb15b364c5a11657514f432dba7d3fd35907cb58b3c47d54165f439d7775db128f8b476e9f7002d9741cb11d4cba83ce8998db003bfad761c4db710  tools.conf.patch
-d4d0c0c3042eef4d241c933de6f7c398a88275744b3576efc2f909acd681752f548e4ae4a17eca7db731ee0b9254b46169a48463d12a72ec6354065d788159f4  open-vm-tools.initd
-820ff0ed2911c63970ee7cfad4cd9ea4a0eeee000de4e87e2d231bf8816a48af3af73ad288cca0adddf9e8fed7f36c72298fe0549fe945aded33fc186a6b31dd  open-vm-tools.confd
+1248234f19a29b28b6a75886b39d1579d0f94d43925db1f709b7a05907582f6650b78d39155e7da335f27b6da00586b9c3dc3ca7e4cab19dba5c84cfefd1e6cb  open-vm-tools.initd
+f996fc598d01ea778797674fca2a9f467d7ce7ced50e4e0343b3d53bea65770df488b1a286e42603d91e05ba85610161eb68e3fbaa5cbf1757a8aec81869a677  open-vm-tools.confd
 4b79d7432f366e5ef202e69bffed5caacab8008f39475d50d54cfa5ac9f521cc0df7122d8e3a95340a4b00cb0b202717293df14f9d411d5edf41dcc7fa4c0550  open-vm-tools.logrotate"
diff --git a/community/open-vm-tools/open-vm-tools.confd b/community/open-vm-tools/open-vm-tools.confd
index d5485bd8ac..4241a38b31 100644
--- a/community/open-vm-tools/open-vm-tools.confd
+++ b/community/open-vm-tools/open-vm-tools.confd
@@ -1,7 +1,7 @@
 # Configuration for /etc/init.d/open-vm-tools
 
-# Set this to 'yes' to enable drag & drop (and vmblock) loading.
-# Please note that this feature requires open-vm-tools-hgfs to be installed.
+# Set this to 'yes' to enable drag'n'drop loading.
+# Please note that this feature requires open-vm-tools-gtk to be installed.
 #vm_drag_and_drop="no"
 
 # Additional options to pass into vmtoolsd.
diff --git a/community/open-vm-tools/open-vm-tools.initd b/community/open-vm-tools/open-vm-tools.initd
index fab4d22a39..934ab0edc5 100644
--- a/community/open-vm-tools/open-vm-tools.initd
+++ b/community/open-vm-tools/open-vm-tools.initd
@@ -1,9 +1,6 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
 
-# Note: $VM_DRAG_AND_DROP is here for backward compatibility.
-: ${vm_drag_and_drop:="${VM_DRAG_AND_DROP:-}"}
+: ${vm_drag_and_drop:="no"}
 
 command="/usr/bin/vmtoolsd"
 command_background="yes"
@@ -11,57 +8,40 @@ pidfile="/run/vmtoolsd.pid"
 # To not complain about missing messages...
 start_stop_daemon_args="--env LANG=en_US.UTF-8"
 
-vmblockmntpt="/proc/fs/vmblock/mountPoint"
-vmblockfusemntpt="/run/vmblock-fuse"
-
 depend() {
 	before net X
 }
 
+start_pre() {
+	[ "$vm_drag_and_drop" != yes ] || start_vmblock
+}
+
+stop_post() {
+	[ "$vm_drag_and_drop" != yes ] || stop_vmblock || true
+}
+
 start_vmblock() {
-	checkpath -d -m 1777 /tmp/VMwareDnD
+	if ! [ -x /usr/bin/vmware-vmblock-fuse ]; then
+		eerror "you have to install open-vm-tools-gtk to enable drag'n'drop!"
+		return 1
+	fi
 
-	if command -v vmware-vmblock-fuse > /dev/null; then
-		modprobe fuse > /dev/null 2>&1
-		checkpath -d "$vmblockfusemntpt"
+	modprobe fuse > /dev/null 2>&1
 
-		ebegin "Mounting vmblock-fuse"
-		vmware-vmblock-fuse \
-			-o subtype=vmware-vmblock,default_permissions,allow_other \
-			"$vmblockfusemntpt"
-		eend $?
-	else
-		modprobe vmblock > /dev/null 2>&1
-		checkpath -d "$vmblockmntpt"
+	checkpath -d -m 1777 /tmp/VMwareDnD
+	checkpath -d /run/vmblock-fuse
 
-		ebegin "Mounting vmblock"
-		mount -t vmblock vmblock "$vmblockmntpt"
-		eend $?
-	fi
+	ebegin "Mounting vmblock-fuse"
+	vmware-vmblock-fuse \
+		-o subtype=vmware-vmblock,default_permissions,allow_other \
+		/run/vmblock-fuse
+	eend $?
 }
 
 stop_vmblock() {
-	if [ -d "$vmblockfusemntpt" ]; then
+	if mount | grep -qw /run/vmblock-fuse; then
 		ebegin "Unmounting vmblock-fuse"
-		umount "$vmblockfusemntpt"
-		eend $?
-	else
-		ebegin "Unmounting vmblock"
-		umount "$vmblockmntpt"
+		umount /run/vmblock-fuse
 		eend $?
 	fi
 }
-
-start_pre() {
-	if [ "$vm_drag_and_drop" = yes ]; then
-		start_vmblock
-	fi
-	return 0
-}
-
-stop_post() {
-	if [ "$vm_drag_and_drop" = yes ]; then
-		stop_vmblock
-	fi
-	return 0
-}