diff options
| author | Michael Janczyk | 2010-04-06 20:01:24 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2010-04-06 20:01:24 +0200 |
| commit | e437b8813f2a84ccffa3a75ba1f534b38ce72b9c (patch) | |
| tree | fcc8c42ec290da4f343797d4eee4c03087fd01df /os-plugins/plugins/vmware | |
| parent | Adding the runlevel linker again (having the upstart component for newer (diff) | |
| download | core-e437b8813f2a84ccffa3a75ba1f534b38ce72b9c.tar.gz core-e437b8813f2a84ccffa3a75ba1f534b38ce72b9c.tar.xz core-e437b8813f2a84ccffa3a75ba1f534b38ce72b9c.zip | |
cumulative commit of local branch, many changes regarding virtualization
Diffstat (limited to 'os-plugins/plugins/vmware')
| -rw-r--r-- | os-plugins/plugins/vmware/XX_vmware.sh | 9 | ||||
| -rw-r--r-- | os-plugins/plugins/vmware/files/run-virt.include | 10 |
2 files changed, 11 insertions, 8 deletions
diff --git a/os-plugins/plugins/vmware/XX_vmware.sh b/os-plugins/plugins/vmware/XX_vmware.sh index cb8683f6..116561f6 100644 --- a/os-plugins/plugins/vmware/XX_vmware.sh +++ b/os-plugins/plugins/vmware/XX_vmware.sh @@ -12,6 +12,10 @@ # script is included from init via the "." load function - thus it has all # variables and functions available +# TODO: +# configs nach /etc/opt/openslx/plugins/vmware +# cp nach run-virt.include + # TODO: nvram,functions # write /etc/vmware/config (if a non-standard location of vmware basedir is # to be configured), /etc/init.d/vmware @@ -159,9 +163,8 @@ ${vmware_imagesrc}." nonfatal prefvmx.useRecommendedLockedMemSize = "TRUE"' | sed -e "s/^ *//" \ >/mnt/etc/vmware/config - # copy version depending files - the vmchooser expects for every virtua- - # lization plugin a file named after it (here run-vmware.include) - cp ${PLUGINDIR}/run-virt.include ${PLUGINCONFDIR}/run-vmware.include + # copy virtualization include files to config dir + cp ${PLUGINDIR}/run-virt.include ${PLUGINCONFDIR} # copy version depending files cp ${PLUGINDIR}/${vmware_kind}/vmplayer ${BINDIR}/vmplayer if [ -e ${PLUGINDIR}/${vmware_kind}/vmware ]; then diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include index 6328baab..dfd07a89 100644 --- a/os-plugins/plugins/vmware/files/run-virt.include +++ b/os-plugins/plugins/vmware/files/run-virt.include @@ -1,6 +1,6 @@ # run-virt.include # ----------------------------------------------------------------------------- -# Copyright (c) 2009 - RZ Uni Freiburg +# Copyright (c) 2009..2010 - RZ Uni Freiburg # Copyright (c) 2009..2010 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. @@ -13,7 +13,7 @@ # ----------------------------------------------------------------------------- # run-virt.include # - component for vmware/player of the vmchooser plugin run-virt.sh -# ----------------------------------------------------------------------------- +################################################################################ # configuration writer functions ################################################################################ @@ -140,8 +140,8 @@ usb.generic.autoconnect = \"TRUE\" sharedFolder0.present = \"TRUE\" sharedFolder0.enabled = \"${shared_folder}\" sharedFolder0.expiration = \"never\" -sharedFolder0.guestName = \"Home\" -sharedFolder0.hostPath = \"${HOME}\" +sharedFolder0.guestName = \"${sharename}\" +sharedFolder0.hostPath = \"${sharepath}\" sharedFolder0.readAccess = \"TRUE\" sharedFolder0.writeAccess = \"TRUE\" sharedFolder.maxNum = \"1\" @@ -451,5 +451,5 @@ writelog "" ################################################################################ # using the modified version of the wrapper script -VIRTCMD=/var/opt/openslx/bin/vmplayer +VIRTCMD="${OPENSLX_DEFAULT_BINDIR}/vmplayer" VIRTCMDOPTS="${vmopt} ${conffile}" |