diff options
| author | Dirk von Suchodoletz | 2011-03-01 09:59:39 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2011-03-01 09:59:39 +0100 |
| commit | 0b56aac2b8267a9bccf7add3a3a7949fa9c8ad57 (patch) | |
| tree | ee55d9f7a67ea11d8e2f5ff188203420f212b954 /src | |
| parent | Merge branch 'stable' of openslx.org:openslx/core into stable (diff) | |
| download | core-0b56aac2b8267a9bccf7add3a3a7949fa9c8ad57.tar.gz core-0b56aac2b8267a9bccf7add3a3a7949fa9c8ad57.tar.xz core-0b56aac2b8267a9bccf7add3a3a7949fa9c8ad57.zip | |
Have a dedicated tempfs directory for the vmware special files instead
of the generic one ...
Diffstat (limited to 'src')
| -rw-r--r-- | src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm | 13 | ||||
| -rw-r--r-- | src/os-plugins/plugins/vmware/files/run-virt.include | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm index 04a4b15c..17d18383 100644 --- a/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm +++ b/src/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm @@ -1,4 +1,4 @@ -# Copyright (c) 2008..2010 - OpenSLX GmbH +# Copyright (c) 2008..2011 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -405,6 +405,15 @@ sub _writeRunlevelScript $initfile->setDesc("Setup environment for VMware Workstation or Player ($kind)."); # functions ... + $script = unshiftHereDoc(<<" End-of-Here"); + # Create a special tempfs directory + mkdir -m 1777 -p /tmp/vmware + mount -t tmpfs -o 'size=180%,mode=1777' /tmp/vmware + End-of-Here + $initfile->addFunction( + "tempdir", + "$script" + ); $modlist = "vmnet vmmon"; $script = unshiftHereDoc(<<" End-of-Here"); # VMplayer common stuff @@ -494,6 +503,7 @@ sub _writeRunlevelScript # hack to access the first serial/parallel port chmod a+rw /dev/ttyS0 chmod a+rw /dev/parport0 + tempdir load_modules vmnetif End-of-Here @@ -512,6 +522,7 @@ sub _writeRunlevelScript vmware-tray vmnet-dhcpd 2>/dev/null # might take a while until all services are shut down sleep 1 + umount -l /tmp/vmware 2>/dev/null unload_modules End-of-Here $initfile->addToCase( diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include index 6f1098d5..742b4020 100644 --- a/src/os-plugins/plugins/vmware/files/run-virt.include +++ b/src/os-plugins/plugins/vmware/files/run-virt.include @@ -227,9 +227,9 @@ pref.eula.1.buildNumber = \"${vmbuild}\"" >${vmhome}/preferences # VM-ID static (0D), remove if changed to 00 VM_ID="0D" # temporary disk space for logs, etc... -redodir=/var/tmp/vmware/${USER} +redodir=/tmp/vmware/${USER} # dir for configs and vmem file -confdir=/var/tmp/vmware/${USER} +confdir=/tmp/vmware/${USER} # configfile conffile="${confdir}/run-vmware.conf" # diskfile |