- added check in initscript whether VMTOOLSUSER_BIN exists

OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=192

_service:recompress:download_url:open-vm-tools-2011.04.25-402641.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6724632168332df1816f0d7e1b1c1d1523e4a4ddbe4b75173dc6c71ea90a98b9
-size 2577538

open-vm-tools.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 25 14:30:41 UTC 2011 - prusnak@opensuse.org
+
+- added check in initscript whether VMTOOLSUSER_BIN exists
+
 -------------------------------------------------------------------
 Fri Apr 29 16:08:33 UTC 2011 - dimstar@opensuse.org
 

open-vm-tools.spec

@@ -16,13 +16,11 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 # exclude AMD PCnet32 LANCE pci.id from Supplements list [bnc#397554]
 %define __find_supplements sh -c '/usr/lib/rpm/find-supplements %{name} | grep -v pci:v00001022d00002000'
 
 # Modules that have to be build up to version 12.1 (Last checked on 2011-04-14 with kernel 2.6.38)
-%if 0%{suse_version} <= 1210
+%if 0%{?suse_version} <= 1210
 %define mod1210 vmblock vmhgfs vmsync vmxnet vmci vsock
 %endif
 
@@ -30,13 +28,13 @@
 %define with_X 1
 
 Name:           open-vm-tools
-Group:          System/Emulators/PC
-Summary:        Open Virtual Machine Tools
 Version:        2011.04.25
 Release:        1
+License:        BSD3c ; GPLv2 ; LGPLv2.1
+Summary:        Open Virtual Machine Tools
 %define         svn_rev 402641
 Url:            http://open-vm-tools.sourceforge.net/
-License:        BSD3c ; GPLv2 ; LGPLv2.1
+Group:          System/Emulators/PC
 Source:         %{name}-%{version}-%{svn_rev}.tar.bz2
 Source1:        vmtoolsd
 Source2:        vmware-user-autostart.desktop
@@ -44,29 +42,30 @@ Source4:        open-vm-tools.permissions
 Source5:        vmware-user-autostart-wrapper
 Source6:        open-vm-tools-modprobe.conf
 Source98:       preamble
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
+BuildRequires:  gtkmm2-devel
 BuildRequires:  kernel-source
 BuildRequires:  kernel-syms
-BuildRequires:  module-init-tools
 BuildRequires:  libdnet-devel
 BuildRequires:  libicu-devel
+BuildRequires:  module-init-tools
 BuildRequires:  pcre-devel
+BuildRequires:  pkgconfig(gtk+-2.0)
 BuildRequires:  procps
-BuildRequires:  gtk2-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-devel
-BuildRequires:  gtkmm2-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # liburiparser was not present before 11.0
 %if 0%{?suse_version} >= 1100
 BuildRequires:  liburiparser-devel
 %endif
 BuildRequires:  pam-devel
-PreReq:         %insserv_prereq  %fillup_prereq
-PreReq:         permissions
-ExclusiveArch:  %ix86 x86_64
 Requires:       vmware-guest-kmp
 Supplements:    modalias(pci:v000015ADd*sv*sd*bc*sc*i*)
+Requires(pre):  %fillup_prereq
+Requires(pre):  %insserv_prereq
+Requires(pre):  permissions
+ExclusiveArch:  %ix86 x86_64
 
 %define vm_modules %{?mod1210} %{?mod1120}
 
@@ -125,7 +124,7 @@ useful functions like:
 * General mechanisms and protocols for communication between host and
 guests and from guest to guest
 
-%if %with_X
+%if %{with_X}
 
 %package gui
 License:        BSD3c ; GPLv2 ; LGPLv2.1
@@ -133,7 +132,7 @@ Summary:        Open Virtual Machine Tools - GUI
 Group:          System/Emulators/PC
 Requires:       open-vm-tools
 Supplements:    packageand(open-vm-tools:xorg-x11)
-PreReq:         permissions
+Requires(pre):  permissions
 
 %description gui
 GUI Toolbox for Open Virtual Machine Tools
@@ -174,7 +173,7 @@ sed -i -e "s/\r//" README
     --without-kernel-modules \
     --without-root-privileges \
     --without-procps \
-%if %with_X
+%if %{with_X}
     --with-x \
 %else
     --without-x \
@@ -200,7 +199,7 @@ done
 
 %install
 # let's use the kernel's own modules_install routine
-export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
+export INSTALL_MOD_PATH=%{buildroot}
 export INSTALL_MOD_DIR=updates
 pushd ..
 for flavor in %{flavors_to_build}; do
@@ -213,33 +212,33 @@ done
 popd
 
 # fix some rights on the kernel modules, to have a complete -debuginfo package
-chmod u+x $RPM_BUILD_ROOT/lib/modules/*/updates/*
+chmod u+x %{buildroot}/lib/modules/*/updates/*
 
-%makeinstall
+%make_install
 # Clean up the *.la files make install put all around
 find %{buildroot} -name '*.la' -delete -print
 
 # install the vmtoolsd init script and also it's rcvmtoolsd softlink
-install -D -m 0755 %{S:1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/vmtoolsd
+install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/vmtoolsd
-ln -sf ../../etc/init.d/vmtoolsd $RPM_BUILD_ROOT%{_sbindir}/rcvmtoolsd
+ln -sf ../../etc/init.d/vmtoolsd %{buildroot}%{_sbindir}/rcvmtoolsd
 
-%if %with_X
+%if %{with_X}
 # vmware-user is started by vmware-user-suid-wrapper by xdg-autostart
 # unfortunately, vmware-user-suid-wrapper does not wait for it's block device
 # to appear. For this reason we have now a vmware-user-autostart-wrapper
 # which checks for /proc/fs/vmblock/dev to appear and then starts vmware-user-suid-wrapper
-install -D -m 0755 %{S:5} $RPM_BUILD_ROOT%{_bindir}/vmware-user-autostart-wrapper
+install -D -m 0755 %{SOURCE5} %{buildroot}%{_bindir}/vmware-user-autostart-wrapper
-install -D -m 0644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xdg/autostart/vmware-user-autostart.desktop
 # We have our own 'safe' autostart wrapper, which checks for modules to start in autologin mode...
 # Thus we drop the 'original' autostartup
-%__rm %{buildroot}%{_sysconfdir}/xdg/autostart/vmware-user.desktop
+rm %{buildroot}%{_sysconfdir}/xdg/autostart/vmware-user.desktop
 
 # handle the .destop files for translations
 %suse_update_desktop_file vmware-user-autostart
 %endif
 
 # modprobe configuration for vmnics.
-install -D -m 0644 %{S:6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.conf
+install -D -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/modprobe.d/50-vmnics.conf
 
 # fix a link pointing to the buildroot for mount.vmhgfs
 ( cd %{buildroot}/sbin; rm mount.vmhgfs; ln -s ..%{_sbindir}/mount.vmhgfs )
@@ -253,7 +252,7 @@ rm -r %{buildroot}%{_datadir}/%{name}
 /sbin/ldconfig
 %{fillup_and_insserv -Y vmtoolsd}
 
-%if %with_X
+%if %{with_X}
 %verifyscript gui
 %verify_permissions
 
@@ -292,7 +291,7 @@ rm -rf %{buildroot}
 %dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/plugins/common
 %dir %{_libdir}/%{name}/plugins/vmsvc
-%if %with_X
+%if %{with_X}
 %dir %{_libdir}/%{name}/plugins/vmusr
 %endif
 %{_libdir}/%{name}/plugins/vmsvc/libguestInfo.so
@@ -315,7 +314,7 @@ rm -rf %{buildroot}
 %{_sbindir}/rcvmtoolsd
 %exclude %{_libdir}/*.so
 
-%if %with_X
+%if %{with_X}
 
 %files gui
 %defattr(-, root, root)

vmtoolsd

@@ -101,7 +101,9 @@ case "$1" in
 	# We need to inform the User process that we're going down.
 	# Otherwise it keeps references on /proc/fs/vmblock/* and
 	# causes issues when reloading vmblock module.
-	/sbin/killproc -SIGUSR1 $VMTOOLSUSER_BIN
+	if [ -f "$VMTOOLSUSER_BIN" ]; then
+		/sbin/killproc -SIGUSR1 $VMTOOLSUSER_BIN
+	fi
 	/sbin/killproc -TERM $VMTOOLSD_BIN
 	umount /proc/fs/vmblock/mountPoint || :
 	modprobe -r vmblock || :