summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Uhrig2008-05-30 14:30:45 +0200
committerVolker Uhrig2008-05-30 14:30:45 +0200
commite495ac9eef3e7e9795eafa316002b32347dcd784 (patch)
tree2cda28b17bb1bdad986ca2ed00abe1850e1422c4
parentremoved bug: the config name wasn't adjusted after renaming. moved kdm images... (diff)
downloadcore-e495ac9eef3e7e9795eafa316002b32347dcd784.tar.gz
core-e495ac9eef3e7e9795eafa316002b32347dcd784.tar.xz
core-e495ac9eef3e7e9795eafa316002b32347dcd784.zip
* added needed configuration for /etc/vmware/config
we really need this file * Changes will be tested soon git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1816 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm14
-rw-r--r--os-plugins/plugins/vmware/XX_vmware.sh13
2 files changed, 23 insertions, 4 deletions
diff --git a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
index e04aed0b..e3b3b689 100644
--- a/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
+++ b/os-plugins/plugins/vmware/OpenSLX/OSPlugin/vmware.pm
@@ -294,6 +294,16 @@ sub _writeWrapperScript
}
}
+sub _wirteVmwareConfig {
+ my $self = shift;
+ my $kind = shift;
+ my $vmpath = shift;
+
+ my $config = "libdir = \"$vmpath\"";
+
+ spitFile("$self->{'pluginRepositoryPath'}/$kind/config", $config);
+ chmod 0755, "$self->{'pluginRepositoryPath'}/$kind/config";
+}
########################################################################
## Functions, which setup the different environments (local, ws-v(5.5|6),
@@ -438,6 +448,10 @@ sub _vmpl2Installation {
##
## Create wrapperscripts
$self->_writeWrapperScript("$vmpath", "$kind", "player")
+
+ ##
+ ## Creating needed config /etc/vmware/config
+ $self->_wirteVmwareConfig("$kind", "$vmpath");
}
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh
index 30f6fe0f..6df821eb 100644
--- a/os-plugins/plugins/vmware/XX_vmware.sh
+++ b/os-plugins/plugins/vmware/XX_vmware.sh
@@ -251,12 +251,17 @@ $(ipcalc -m $vmip/$vmpx|sed s/.*=//) {" \
cp /mnt/opt/openslx/plugin-repo/vmware/${vmware_kind}/runvmware \
/mnt/var/X11R6/bin/run-vmware.sh
chmod 755 /mnt/var/X11R6/bin/run-vmware.sh
- if [ "${vmware_kind}" = "vmpl2.0" ]; then
+
+
+ # affects only kernel and config depending configuration of not
+ # local installed versions
+ if [ "${vmware_kind}" != "local" ]; then
# TODO: setup up kernel files
- # need something in it. see
- # http://openslx.org/trac/de/openslx/wiki/WasEsNochZuDokumentierenGilt
- echo ""
+ cp /mnt/opt/openslx/plugin-repo/vmware/${vmware_kind}/config \
+ /mnt/etc/vmware
+ chmod 644 /mnt/etc/vmware/config
fi
+
[ $DEBUGLEVEL -gt 0 ] && echo " * done with 'vmware' os-plugin ..."