Ubuntu
open-vm-tools package

FFe: New upstream of open-vm-tools

Bug #632101 reported by Nate Muench (Mink)
18
This bug affects 2 people
Affects Status Importance Assigned to Milestone
open-vm-tools (Ubuntu)
Fix Released
Low
Unassigned

Bug Description

Binary package hint: open-vm-tools

This is a request for a FeatureFreezeException to merge open-vm-tools version 2010.06.16-268169-3 from Debian testing.

I'm in the process of putting together a merge proposal (which I'll propose as soon as I get an exception).

The vmhgfs module fails to load, this bug, which was found in the version 2010.04.25-253928-2 packaging, was merged in to the Maverick repo by Evan's original merge followed by my update (to fix the compiling problems with the Maverick kernel).

I want to note that this bug (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=579721) was marked as serious, and the open-vm-source package was indicated in the report.

Debian has fixed this problem (pushing it into their repos 2 days after Maverick's FeatureFreeze went into effect).

We'll (or I'll) have to merge the June 2010 version into the Maverick repo to fix the problem.

I've rediffed the vsock patch (to adjust for changes made to the file) and pushed it to my PPA (https://launchpad.net/~n-muench/+archive/ppa), I've verified the it works, and the modules compile successfully with the Maverick kernels (currently 2.6.35-19)

I can confirm that vmhgfs module shows up when running "lsmod | grep vm"

The Upstream changelog, the Debian changelog, as well as my rediffed vsock patch will be attached shortly.

Tags: patch

Related branches

lp:~n-muench/ubuntu/maverick/open-vm-tools/open-vm-tools.fix-632101
Stefano Rivera: Approve
Diff: 207038 lines (+33932/-140574)
290 files modified
ChangeLog (+5/-0)
INSTALL (+164/-36)
Makefile.in (+146/-65)
NEWS (+24/-0)
aclocal.m4 (+197/-113)
autom4te.cache/output.0 (+0/-33514)
autom4te.cache/output.1 (+0/-33514)
autom4te.cache/output.2 (+0/-33514)
autom4te.cache/requests (+0/-484)
autom4te.cache/traces.0 (+0/-2756)
autom4te.cache/traces.1 (+0/-1302)
autom4te.cache/traces.2 (+0/-2756)
checkvm/Makefile.in (+91/-46)
config/compile (+11/-10)
config/config.guess (+0/-1526)
config/config.sub (+0/-1658)
config/depcomp (+64/-23)
config/install-sh (+3/-2)
config/ltmain.sh (+676/-143)
config/missing (+29/-20)
configure (+6121/-14166)
configure.ac (+28/-4)
debian/README.source (+1/-1)
debian/changelog (+40/-0)
debian/control (+1/-1)
debian/local/Makefile (+4/-2)
debian/open-vm-dkms.dirs (+0/-1)
debian/open-vm-tools.init (+14/-2)
debian/patches/01-kvers.patch (+12/-24)
debian/patches/02-procps.patch (+0/-55)
debian/patches/02-vmxnet.patch (+30/-0)
debian/patches/03-vmxnet.patch (+0/-30)
debian/patches/03-vsock.patch (+87/-0)
debian/patches/04-vsock.patch (+0/-123)
debian/patches/series (+2/-3)
debian/rules (+1/-1)
docs/Makefile.in (+106/-37)
docs/api/Makefile.in (+37/-12)
docs/api/services/utils.txt (+6/-1)
hgfsclient/Makefile.in (+93/-48)
hgfsmounter/Makefile.in (+91/-48)
lib/Makefile.am (+1/-0)
lib/Makefile.in (+116/-47)
lib/SLPv2Parser/Makefile.in (+56/-25)
lib/appUtil/Makefile.in (+56/-25)
lib/auth/Makefile.in (+56/-25)
lib/backdoor/Makefile.in (+56/-25)
lib/conf/Makefile.in (+56/-25)
lib/dict/Makefile.in (+56/-25)
lib/dnd/Makefile.in (+56/-25)
lib/dndGuest/Makefile.in (+56/-25)
lib/dynxdr/Makefile.in (+56/-25)
lib/err/Makefile.in (+56/-25)
lib/eventManager/Makefile.in (+56/-25)
lib/file/Makefile.in (+56/-25)
lib/file/file.c (+0/-4)
lib/file/fileIO.c (+0/-107)
lib/file/fileIOPosix.c (+0/-81)
lib/file/fileLockPosix.c (+49/-61)
lib/file/fileLockPrimitive.c (+15/-5)
lib/file/filePosix.c (+66/-110)
lib/foundryMsg/Makefile.in (+56/-25)
lib/foundryMsg/foundryMsg.c (+15/-20)
lib/ghIntegration/Makefile.in (+56/-25)
lib/ghIntegrationStub/Makefile.in (+56/-25)
lib/guestApp/Makefile.in (+65/-34)
lib/guestApp/guestApp.c (+91/-37)
lib/guestInfo/Makefile.in (+68/-37)
lib/guestRpc/Makefile.in (+56/-25)
lib/hgfs/Makefile.in (+56/-25)
lib/hgfs/hgfsUtil.c (+2/-0)
lib/hgfsBd/Makefile.in (+56/-25)
lib/hgfsHelper/Makefile.in (+56/-25)
lib/hgfsServer/Makefile.am (+1/-0)
lib/hgfsServer/Makefile.in (+61/-27)
lib/hgfsServer/hgfsDirNotify.h (+13/-13)
lib/hgfsServer/hgfsDirNotifyStub.c (+9/-9)
lib/hgfsServer/hgfsServer.c (+2495/-3931)
lib/hgfsServer/hgfsServerInt.h (+321/-185)
lib/hgfsServer/hgfsServerLinux.c (+597/-2376)
lib/hgfsServer/hgfsServerPacketUtil.c (+18/-20)
lib/hgfsServer/hgfsServerParameters.c (+4819/-0)
lib/hgfsServerManagerGuest/Makefile.in (+56/-25)
lib/hgfsServerManagerGuest/hgfsServerManagerGuest.c (+1/-1)
lib/hgfsServerPolicyGuest/Makefile.in (+56/-25)
lib/image/Makefile.in (+56/-25)
lib/image/imageUtilPng.c (+2/-2)
lib/impersonate/Makefile.in (+56/-25)
lib/include/buildNumber.h (+6/-6)
lib/include/file.h (+2/-1)
lib/include/fileIO.h (+0/-26)
lib/include/guestApp.h (+5/-3)
lib/include/hashTable.h (+5/-0)
lib/include/hgfsProto.h (+25/-22)
lib/include/hgfsServer.h (+20/-19)
lib/include/hgfsTransport.h (+75/-11)
lib/include/hgfsUtil.h (+37/-0)
lib/include/hostinfo.h (+2/-2)
lib/include/libMutexRank.h (+112/-0)
lib/include/loglevel_user.h (+5/-4)
lib/include/msg.h (+2/-0)
lib/include/productState.h (+1/-0)
lib/include/stats_file.h (+0/-58)
lib/include/userlock.h (+203/-0)
lib/include/util.h (+5/-67)
lib/include/uuid.h (+1/-3)
lib/include/vix.h (+5/-0)
lib/include/vixCommands.h (+32/-89)
lib/include/vixOpenSource.h (+14/-0)
lib/include/vm_atomic.h (+8/-1)
lib/include/vm_basic_asm.h (+264/-45)
lib/include/vm_basic_defs.h (+44/-29)
lib/include/vm_basic_types.h (+0/-5)
lib/include/vm_product.h (+4/-14)
lib/include/vm_tools_version.h (+10/-3)
lib/include/vm_version.h (+6/-6)
lib/include/vmci_defs.h (+24/-1)
lib/include/vmware/guestrpc/tclodefs.h (+15/-0)
lib/include/vthreadBase.h (+153/-0)
lib/include/wiper.h (+2/-1)
lib/include/x86cpuid.h (+2/-1)
lib/lock/Makefile.am (+28/-0)
lib/lock/Makefile.in (+565/-0)
lib/lock/ul.c (+645/-0)
lib/lock/ulCondVar.c (+785/-0)
lib/lock/ulExcl.c (+659/-0)
lib/lock/ulInt.h (+557/-0)
lib/lock/ulIntShared.h (+31/-0)
lib/lock/ulRW.c (+894/-0)
lib/lock/ulRec.c (+851/-0)
lib/lock/ulSema.c (+741/-0)
lib/message/Makefile.in (+56/-25)
lib/misc/Makefile.am (+1/-0)
lib/misc/Makefile.in (+62/-28)
lib/misc/atomic.c (+0/-1)
lib/misc/hashTable.c (+57/-20)
lib/misc/hostinfo.c (+47/-8)
lib/misc/hostinfoPosix.c (+264/-186)
lib/misc/machineID.c (+33/-13)
lib/misc/timeutil.c (+38/-43)
lib/misc/vthreadBase.c (+1188/-0)
lib/netUtil/Makefile.in (+56/-25)
lib/panic/Makefile.in (+56/-25)
lib/panicDefault/Makefile.in (+56/-25)
lib/printer/Makefile.in (+56/-25)
lib/procMgr/Makefile.in (+56/-25)
lib/raster/Makefile.in (+56/-25)
lib/region/Makefile.in (+56/-25)
lib/resolution/Makefile.in (+56/-25)
lib/rpcChannel/Makefile.in (+62/-31)
lib/rpcIn/Makefile.in (+56/-25)
lib/rpcOut/Makefile.in (+56/-25)
lib/rpcVmx/Makefile.in (+56/-25)
lib/slashProc/Makefile.in (+59/-28)
lib/string/Makefile.in (+56/-25)
lib/stubs/Makefile.in (+56/-25)
lib/syncDriver/Makefile.in (+56/-25)
lib/system/Makefile.in (+56/-25)
lib/unicode/Makefile.in (+56/-25)
lib/unity/Makefile.in (+56/-25)
lib/unityStub/Makefile.in (+56/-25)
lib/unityWindowTracker/Makefile.in (+56/-25)
lib/unityWindowTracker/unityWindowTracker.c (+142/-102)
lib/user/Makefile.in (+56/-25)
lib/user/util.c (+4/-3)
lib/vixTools/Makefile.in (+56/-25)
lib/vixTools/vixTools.c (+376/-124)
lib/vmCheck/Makefile.in (+56/-25)
lib/vmCheck/vmcheck.c (+20/-1)
lib/vmSignal/Makefile.in (+56/-25)
lib/wiper/Makefile.in (+56/-25)
lib/wiper/wiperPosix.c (+6/-0)
libguestlib/Makefile.in (+109/-56)
libvmtools/Makefile.am (+2/-0)
libvmtools/Makefile.in (+136/-77)
libvmtools/fileLogger.c (+1/-1)
libvmtools/vmtoolsInt.h (+16/-0)
libvmtools/vmtoolsLog.c (+12/-11)
libvmtools/vmxLogger.c (+143/-0)
m4/libtool.m4 (+98/-46)
m4/ltoptions.m4 (+1/-1)
m4/ltsugar.m4 (+10/-10)
m4/ltversion.m4 (+5/-5)
modules/Makefile.am (+0/-1)
modules/Makefile.in (+80/-36)
modules/freebsd/vmmemctl/os.c (+108/-223)
modules/linux/dkms.conf (+9/-14)
modules/linux/dkms.sh (+3/-9)
modules/linux/shared/autoconf/epoll.c (+0/-36)
modules/linux/shared/autoconf/netcreate_num_params.c (+48/-0)
modules/linux/shared/autoconf/setnice.c (+0/-32)
modules/linux/shared/autoconf/sk_filter.c (+0/-53)
modules/linux/shared/compat_sched.h (+0/-12)
modules/linux/shared/compat_skbuff.h (+2/-0)
modules/linux/shared/compat_sock.h (+13/-42)
modules/linux/shared/compat_version.h (+1/-7)
modules/linux/shared/compat_wait.h (+0/-76)
modules/linux/shared/vmciGuestKernelAPI.h (+0/-104)
modules/linux/shared/vmciKernelAPI.h (+154/-0)
modules/linux/shared/vmciQPair.h (+0/-188)
modules/linux/shared/vmciQueue.h (+0/-145)
modules/linux/shared/vmci_defs.h (+24/-1)
modules/linux/vmblock/Makefile.kernel (+0/-2)
modules/linux/vmci/Makefile.kernel (+0/-1)
modules/linux/vmci/vmciDatagram.c (+27/-26)
modules/linux/vmci/vmciDatagram.h (+2/-2)
modules/linux/vmci/vmciEvent.c (+1/-2)
modules/linux/vmci/vmciEvent.h (+1/-5)
modules/linux/vmci/vmciGuestDs.c (+16/-15)
modules/linux/vmci/vmciNotifications.c (+49/-1)
modules/linux/vmci/vmciProcess.c (+1/-2)
modules/linux/vmci/vmciQPair.c (+78/-80)
modules/linux/vmci/vmciQueue.h (+145/-0)
modules/linux/vmci/vmciQueuePair.c (+3/-17)
modules/linux/vmci/vmciQueuePairInt.h (+2/-1)
modules/linux/vmci/vmciUtil.c (+58/-28)
modules/linux/vmci/vmciUtil.h (+1/-2)
modules/linux/vmci/vmci_drv.c (+199/-38)
modules/linux/vmhgfs/transport.c (+18/-14)
modules/linux/vmhgfs/transport.h (+1/-0)
modules/linux/vmhgfs/vmci.c (+448/-96)
modules/linux/vmmemctl/COPYING (+0/-339)
modules/linux/vmmemctl/Makefile (+0/-167)
modules/linux/vmmemctl/Makefile.kernel (+0/-72)
modules/linux/vmmemctl/README (+0/-11)
modules/linux/vmmemctl/os.c (+0/-708)
modules/linux/vmmemctl/vmmemctl_version.h (+0/-32)
modules/linux/vmxnet/vmxnet.c (+63/-22)
modules/linux/vmxnet/vmxnet_version.h (+3/-3)
modules/linux/vsock/Makefile.kernel (+1/-5)
modules/linux/vsock/linux/af_vsock.c (+17/-18)
modules/linux/vsock/linux/af_vsock.h (+1/-5)
modules/linux/vsock/linux/vmciContext.h (+0/-122)
modules/linux/vsock/linux/vmciDatagram.h (+0/-77)
modules/linux/vsock/linux/vmciHostKernelAPI.h (+0/-109)
modules/linux/vsock/linux/vsockAddr.c (+1/-3)
modules/linux/vsock/linux/vsockCommon.h (+0/-4)
modules/shared/vmmemctl/balloon_def.h (+1/-0)
modules/shared/vmmemctl/os.h (+0/-12)
modules/shared/vmmemctl/vmballoon.c (+39/-171)
modules/shared/vmmemctl/vmballoon.h (+12/-4)
modules/shared/vmxnet/net.h (+71/-1)
modules/solaris/vmmemctl/Makefile (+3/-58)
modules/solaris/vmmemctl/os.c (+90/-333)
modules/solaris/vmmemctl/vmballoon_kstats.c (+22/-25)
modules/solaris/vmmemctl/vmmemctl.conf (+0/-5)
modules/solaris/vmmemctl/vmmemctl.h (+0/-30)
modules/solaris/vmmemctl/vmmemctld.c (+0/-145)
rpctool/Makefile.in (+91/-46)
scripts/Makefile.in (+112/-38)
scripts/common/statechange.sh (+8/-7)
services/Makefile.in (+106/-37)
services/plugins/Makefile.in (+106/-37)
services/plugins/guestInfo/Makefile.in (+91/-42)
services/plugins/hgfsServer/Makefile.in (+88/-39)
services/plugins/hgfsServer/hgfsPlugin.c (+1/-1)
services/plugins/powerOps/Makefile.in (+88/-39)
services/plugins/resolutionSet/Makefile.in (+94/-45)
services/plugins/resolutionSet/resolutionSet.c (+13/-14)
services/plugins/timeSync/Makefile.in (+97/-48)
services/plugins/vix/Makefile.in (+97/-48)
services/plugins/vix/foundryToolsDaemon.c (+1/-2)
services/plugins/vixUser/Makefile.in (+88/-39)
services/plugins/vmbackup/Makefile.in (+101/-52)
services/plugins/vmbackup/stateMachine.c (+3/-0)
services/vmtoolsd/Makefile.in (+155/-76)
tests/Makefile.in (+106/-37)
tests/testDebug/Makefile.am (+21/-0)
tests/testDebug/Makefile.in (+122/-46)
tests/testDebug/testDebug.c (+9/-13)
tests/testPlugin/Makefile.in (+92/-43)
tests/testPlugin/testPlugin.c (+7/-10)
tests/testVmblock/Makefile.in (+67/-34)
tests/vmrpcdbg/Makefile.in (+62/-31)
toolbox/Makefile.in (+151/-89)
toolbox/toolbox-cmd.c (+117/-4)
toolbox/toolboxCmdInt.h (+21/-0)
toolbox/toolboxShrink.c (+3/-1)
toolbox/toolboxcmd-devices.c (+40/-19)
toolbox/toolboxcmd-scripts.c (+36/-23)
toolbox/toolboxcmd-shrink.c (+30/-15)
toolbox/toolboxcmd-stat.c (+33/-13)
toolbox/toolboxcmd-time.c (+15/-13)
vmblock-fuse/Makefile.in (+95/-50)
vmware-user-suid-wrapper/Makefile.in (+91/-46)
vmware-user/Makefile.am (+1/-0)
vmware-user/Makefile.in (+107/-63)
vmware-user/dndUI.cpp (+124/-16)
vmware-user/dndUI.h (+1/-0)
xferlogs/Makefile.in (+91/-46)
lp:ubuntu/maverick/open-vm-tools
lp:ubuntu/oneiric/open-vm-tools
Revision history for this message
Nate Muench (Mink) (n-muench) wrote :

Upstream changelog (taken from the NEWS file in the root of the open-vm-tools folder)

Revision history for this message
Nate Muench (Mink) (n-muench) wrote :

Debian Changelog (for the June release)

Revision history for this message
Nate Muench (Mink) (n-muench) wrote :

My rediffed vsock patch

Revision history for this message
Nate Muench (Mink) (n-muench) wrote :

Added bzr branch

Brian Murray (brian-murray)
tags: added: patch
Revision history for this message
Nate Muench (Mink) (n-muench) wrote :

Here's my Debdiff:

Revision history for this message
Nate Muench (Mink) (n-muench) wrote :

There's 2 things want to note (the first of which needs to be fixed before release day):

1) Before the most recent Maverick Kernel release (2.6.35-21.31), the vmxnet and pcnet32 modules could co-exist, with the vmxnet module being the default network driver/module.

Now because of the kernel released within the last day (2.6.35-21.31), has caused a problem. At boot, Ubuntu now loads the pcnet32 module, but not the vmxnet module. This problem also exists in the Kernel for Lucid proposed (I have the June release installed (from my PPA), except it doesn't have the Maverick patches because the packaging was build specifically for Lucid).

The only way to fix this problem is to blacklist pcnet32 (and the run "update-initramfs -u") in order for the vmxnet load. Doing this might cause issues ("might" is the keyword here).

I don't know what I should do about this. Blacklist the pcnet32 module, or tweak the script to allow pcnet32 and vmxnet to co-exist again.

2) This is something that isn't very urgent, but I would like implemented in the packaging eventually.

With the VMware Tools included with the software, when you want to activate the shared folders feature, and go to the /mnt/hgfs folder, your shared folder is there (this is the default).

But with the open-vm-tools, this is the major issues with it, the shared folders feature doesn't work properly. You can select the folder you want to shared, but it isn't mounted properly. The only to have it properly show up is to run a mount command either at boot or after you mount the folder.

Attached is the script I use to allow shared folders to mount correctly in the /mnt/hgfs folder. I move this script to the /etc/init.d folder and then run "update-rc.d <script> defaults"

Everytime Ubuntu boots, the mount command is run, and the shared folder shows up in the /mnt/hgfs automatically.

You can change anything in the script, but the one this that MUST stay is the mount command. I've certified the mount command works. I did a lot of googling to see what the accurate way to mount the shared folders (with open-vm-tools), and this is the product.

Revision history for this message
Stefano Rivera (stefanor) wrote :

This bug is titled as an FFe, but ubuntu-release isn't subscribed. Subscribing them and marking the merge request as WIP. Please re set it to "Needs Review" when approved.

Revision history for this message
Nate Muench (Mink) (n-muench) wrote :

I'm going to try something. I going to put the loading of the vmxnet module, and the mount command in to the "open-vm-tools.init" file in the debian folder. I've pushed it to one of my PPAs (for Lucid). I'm going to get it a test run in a hour or so. If it succeeds I'll push it packaging (with the Maverick Patches) to the same PPA. And if the Maverick test works fine, I'll push it to my merge proposal.

Revision history for this message
Nate Muench (Mink) (n-muench) wrote :

I just tried the test on Ubuntu Lucid (64-Bit) because it's the only VM I have that I didn't get around to fixing the vmxnet/pcnet32 bug.

Here's my results:
-Injecting a "modrobe vmxnet" into the open-vm-tools.init successfully connects to the internet with the vmxnet module (instead of the pcnet32 module).
-I'm having issues with the Shared Folders mount. I want to point out that the Ubuntu Lucid I'm using had that MountSharedFolders activated, so I removed it (and the references for rc.d(x)). I'm working on this one, it might stay or might get dropped.

Revision history for this message
Nate Muench (Mink) (n-muench) wrote :

It all works now. To get the shared folders to work properly, I just had to add the if statement to check if the hgfs directory exists in the /mnt directory, if it doesn't, create the hgfs directory. If it does exist, do nothing.

I'm going to push these changes to my PPA (for Maverick) as well as in my Merge proposal.

Revision history for this message
Nate Muench (Mink) (n-muench) wrote :

I've finished the fixes, I've pushed the packaging to my PPA (https://launchpad.net/~n-muench/+archive/virtual-test), as well as to my merge proposal.

I've got to wait for the packaging to finish compiling before I can test it. This worked successfully earlier on Lucid (and for the record, the packaging in that PPA for Lucid is missing that if statement).

I've enclosed my debdiff for these changes..

Revision history for this message
Nate Muench (Mink) (n-muench) wrote :

I just tried it on my Maverick VM. Everything looks to be working fine on my end. Shared Folders work, as does loading of the vmxnet module at boot.

I personally think this thing is ready to be merged.

Revision history for this message
Nate Muench (Mink) (n-muench) wrote :

I know this merge won't happen (I think), but would it be okay if I push a new proposal (using what's in the Maverick repo) that would just add:
1) The fixes for the vmhgfs and vsock modules (they are in the 2010.06.16-268169-3 packaging)
2) Loading the vmxnet module at boot. Even if it does get fixed, it's good to have it in, just in case.

Doing this would change only 3 files in the debian folder (local/Makefile, open-vm-tools.init, and the changelog).

As I said earlier, this problem, according to the debian bug report, is marked as serious and affects the packaging in the Maverick Repo.

Revision history for this message
Iulian Udrea (iulian) wrote :

Looks good to me. ubuntu-release ack. Approved. Subscribing ubuntu-sponsors.

Stefano Rivera (stefanor)
Changed in open-vm-tools (Ubuntu):
status: New → Fix Committed
importance: Undecided → Low
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package open-vm-tools - 2010.06.16-268169-3ubuntu1

---------------
open-vm-tools (2010.06.16-268169-3ubuntu1) maverick; urgency=low

  * Merge from Debian testing (LP: #632101), remaining changes:
    - Recommend open-vm-toolbox in open-vm-tools.
    - Rediffing vsock.patch.

open-vm-tools (2010.06.16-268169-3) unstable; urgency=low

  * Updating local Makefile to inject symvers files to fix vmhgfs and
    vsock modules, thanks to Joe Gooch <email address hidden> (Closes:
    #579721).
  * Updating standards version to 3.9.1.

open-vm-tools (2010.06.16-268169-2) unstable; urgency=low

  * Removing vmmemctl fom initscript (Closes: #588356).

open-vm-tools (2010.06.16-268169-1) unstable; urgency=low

  * Merging upstream version 2010.06.16-268169.
  * Updating standards version to 3.9.0.
  * Updating README.source.
  * Rediffing kvers.patch.
  * Dropping procps.patch, not required anymore.
  * Updating packaging for upstreams vmmemctl module removal.
 -- Nate Muench <email address hidden> Mon, 06 Sep 2010 21:06:01 -0500

Changed in open-vm-tools (Ubuntu):
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.