diff options
author | Dirk von Suchodoletz | 2007-10-13 23:26:10 +0200 |
---|---|---|
committer | Dirk von Suchodoletz | 2007-10-13 23:26:10 +0200 |
commit | 7d52c55dc1610bccf8b764f2904bdd20b2b9d44f (patch) | |
tree | 1d8a44671f448b18da60b97fbc5ef405f41bc774 /virtualization | |
parent | Fixed bug #170 (hopefully, please check!) ... (diff) | |
download | core-7d52c55dc1610bccf8b764f2904bdd20b2b9d44f.tar.gz core-7d52c55dc1610bccf8b764f2904bdd20b2b9d44f.tar.xz core-7d52c55dc1610bccf8b764f2904bdd20b2b9d44f.zip |
... on the way to ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1379 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'virtualization')
-rwxr-xr-x | virtualization/templates/Vorlage_VMwareImageAdministrator.xml | 6 | ||||
-rw-r--r-- | virtualization/templates/runvmware-v2 | 30 |
2 files changed, 20 insertions, 16 deletions
diff --git a/virtualization/templates/Vorlage_VMwareImageAdministrator.xml b/virtualization/templates/Vorlage_VMwareImageAdministrator.xml index 396c1a75..4c21f3a9 100755 --- a/virtualization/templates/Vorlage_VMwareImageAdministrator.xml +++ b/virtualization/templates/Vorlage_VMwareImageAdministrator.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?>
<settings>
<eintrag>
- # Imagename ohne .vmdk
+ # Imagename with proper suffix
<image_name param="Vorlage_VMwareImageAdministrator.vmdk">
</image_name>
# Information of the image creator
@@ -15,7 +15,7 @@ <short_description param="Diese Image dient Ihnen als Vorlage für Ihre Installationen. Laden Sie es auf Ihre lokale Festplatte und installieren Sie Ihre Programme!">
</short_description>
# Define long description shown when the Image is chosen
- <long_description param="">
+ <long_description param="Diese Image dient Ihnen als Vorlage für Ihre Installationen. Laden Sie es auf Ihre lokale Festplatte und installieren Sie Ihre Programme!">
</long_description>
#os running in vmware, needed for vmware config file
<os param="Windows XP">
@@ -35,7 +35,7 @@ #Description: as xdm menu? If yes "true", else "false"
<xdm param="false">
</xdm>
- #Description: priority, use a number to get it to a special possition
+ #Description: priority, use a number to get it to a special position
# should only be used by our department and noone else
<priority param="1">
</priority>
diff --git a/virtualization/templates/runvmware-v2 b/virtualization/templates/runvmware-v2 index f9ecdd7f..07cf395b 100644 --- a/virtualization/templates/runvmware-v2 +++ b/virtualization/templates/runvmware-v2 @@ -3,8 +3,8 @@ # Description: Script for preparing VMware environment Diskless # X Stations and interactive session chooser (v4) # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 18-03-2006 -# Michael Janczyk <mj0@uni-freiburg.de>, 10-01-2007 +# Author(s): see project authors file +# # Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg # # Version: 0.16.611 @@ -40,6 +40,8 @@ floppyb="TRUE" floppybname="/etc/vmware/loopimg/fd.img" cdr_1="FALSE" cdr_2="FALSE" +# ide is expected default, test for the virtual disk image type should +# be done while creating the runscripts ... ide="TRUE" scsi="FALSE" hddrv="lsilogic" @@ -101,21 +103,23 @@ imagename="CHANGEIT" diskfile="${vmdir}/${imagename}" #TODO: check for a faster way, perhaps we should put this into XML +# oh - yeah!! Why not do it on the SERVER??? It has enough power and has +# to do it once and not during every start on a client :) #grepping every file could take much (network) resources. And if its #an IDE Image, but has somewhere the string ddb.adapterType stuff can #become screwed # check if IDE or SCSI -hddrv=$(grep -m 1 -ia "ddb.adapterType" ${diskfile} | awk -F "\"" '{print $2}') -if [ "${hddrv}" = "ide" ]; then - ide="TRUE" - scsi="FALSE" -elif [ "${hddrv}" = "lsilogic" ]; then - ide="FALSE" - scsi="TRUE" -elif [ "${hddrv}" = "buslogic" ]; then - ide="FALSE" - scsi="TRUE" -fi +#hddrv=$(grep -m 1 -ia "ddb.adapterType" ${diskfile} | awk -F "\"" '{print $2}') +#if [ "${hddrv}" = "ide" ]; then +# ide="TRUE" +# scsi="FALSE" +#elif [ "${hddrv}" = "lsilogic" ]; then +# ide="FALSE" +# scsi="TRUE" +#elif [ "${hddrv}" = "buslogic" ]; then +# ide="FALSE" +# scsi="TRUE" +#fi # define name for VMware window displayname="CHANGEIT" |