diff options
-rw-r--r-- | vmware/README.naming | 15 | ||||
-rw-r--r-- | vmware/alias | 6 | ||||
-rw-r--r-- | vmware/ostype | 13 | ||||
-rwxr-xr-x | vmware/runvmware | 25 |
4 files changed, 39 insertions, 20 deletions
diff --git a/vmware/README.naming b/vmware/README.naming new file mode 100644 index 00000000..ad1f8f09 --- /dev/null +++ b/vmware/README.naming @@ -0,0 +1,15 @@ +Convention for naming VMware images. +This is not a necessity! + +- First part should be the VMware-OS name (e.g. winxppro). +- When this is not desired there is a possibility to specify this in the ostype file (e.g. winxppro windowsxppro) (s. ostype). +- When none of the above is used, VMware-OS name is 'other'. This seems not to be a big issue, but VMware says that it can cause Problems. When installing etc... a wrong ostype could cause unpredictable results. +- Use lower case letters, there is no guarantee that runvmware work /w upper case letters. +- Second part should be separated by'-'. There is no need for a second part. +- Specia characters are '-', '_', '.' +- Examples: + +winxppro.vmdk +winxppro-office.vmdk +winxppro-work.vmdk + diff --git a/vmware/alias b/vmware/alias index 91f16776..b122f496 100644 --- a/vmware/alias +++ b/vmware/alias @@ -3,8 +3,8 @@ # -NO DUPLICATE ENTRIES!!!- ###### -# -OSType name- | -aliases separated through spaces- +# -VMware-Image name- | -aliases separated through spaces- ##### -winxppro-kursversion winxppro windowsxp winxp -suse-9.3 suse +winxppro-kursversion winxppro windowsxp winxp +suse-9.3 suse diff --git a/vmware/ostype b/vmware/ostype index 2aede341..52e131dc 100644 --- a/vmware/ostype +++ b/vmware/ostype @@ -5,12 +5,11 @@ ##### # For OSType use the first part of the image-name. -# -OSType- | -VMWare name- +# -VMWare-OS name- | -User defined OSType- ##### -windows98 win98 -windows2000 win2000pro -windowsxp winxppro -suse suse -kubuntu other26xlinux -debian other26xlinux +win98 windows98 +win2000pro windows2000 +winxppro windowsxp +suse suse +other26xlinux debian kubuntu diff --git a/vmware/runvmware b/vmware/runvmware index d997ffb2..161a048e 100755 --- a/vmware/runvmware +++ b/vmware/runvmware @@ -4,13 +4,13 @@ # X Stations (v4) # # Author(s): Dirk von Suchodoletz <dirk@goe.net>, 18-03-2006 -# Michael Janczyk <mj0@uni-freiburg.de>, 24-05-2006 +# Michael Janczyk <mj0@uni-freiburg.de>, 26-05-2006 # Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg # last_changes=$(head $0 | grep "@" | awk -F ", " '{print $2}' \ | awk -F "-" '{print $3" "$2" "$1}' | sort -bfnr \ | awk '{print $3"-"$2"-"$1}' | grep -m 1 [0-9]) -version=0.14.e +version=0.14.f ################################################################################ @@ -272,18 +272,19 @@ USAGE: $0 [--options] Image options: -i|--interactive interactive mode with image selection - -s|--start <image name> start image /\$vmdir/<image name>.vmdk + -s|--start <image-name> start image /\${vmdir}/<image-name>.vmdk -a|--alias use aliases --silent no stdout from runvmware --mem <n(M(h)),n(G(h))> override autoallocation of memory, in percent m,M megabyte, g,G gigabyte, h,H reserve f. host - --res <XXXxYYY> Maximum resolution of the guest os, e.g. 800x600 + --res <X_intxY_int> Maximum resolution of the guest os, e.g. 800x600 --delay <n seconds> delay the start of the script n seconds --image <directory> specify image directory --persistent use persistent mode --vmostype <vmwareos> define VMware ostype --include <includefile> include code right before program start --displayaliases aliases you can use with option -a + --floppya enable floppy disk --floppyb use /tmp/loop0 as floppy B, needed for exchanging files w/ VMware VMware options: @@ -506,6 +507,10 @@ while [ ${nofclopt} -gt "${args}" ]; do --windowed) vmopt=$(echo ${vmopt} | sed -e "s,-X,-x,") ;; + + --floppya) + floppya="TRUE" + ;; --floppyb) floppyb="TRUE" ;; @@ -631,8 +636,8 @@ if [ -L /dev/cdrom1 ] ; then fi -# floppy -[ -d /sys/block/fd0 ] && floppya="TRUE" +# check for floppy controller +test ! -d /sys/block/fd0 && floppya="FALSE" # guest resolution @@ -651,8 +656,8 @@ if [ -n "${guestres}" ]; then fi writelog "finished\nResults:\n\tMAC:\t\t00:50:56:0D:${mac}\n\tMem:\t\t${mem} MB - \tResolution:\t${xres}x${yres}\n\tCD-ROM_1:\t${cdr_1} - \tCD-ROM_2:\t${cdr_2}\n" 0 1 + \tMax. res.:\t${xres}x${yres}\n\tFloppy_A:\t${floppya}\n\tFloppy_B:\ + \t${floppyb}\n\tCD-ROM_1:\t${cdr_1}\n\tCD-ROM_2:\t${cdr_2}\n" 0 1 @@ -707,7 +712,7 @@ diskfile="${vmdir}/${startvm}.vmdk" if [ -z "${comdef}" ]; then ostype=$(echo ${startvm} | awk -F "-" '{print $1}') vmostype=$(grep -v "#.*" ${vmtempl}/ostype | grep -w "${ostype}" \ - | awk '{print $2}') + | awk '{print $1}') # if ${ostype} not found use else statement vmostype=${vmostype:-"other"} @@ -723,7 +728,7 @@ displayname=${displayname:-"VMware Image"} writelog "finished\nResults:\n\tDiskfile:\t${diskfile} - \tVMimage:\t${vmostype}\n\tDisplayname:\t${displayname}\n" 0 1 + \tVMostype:\t${vmostype}\n\tDisplayname:\t${displayname}\n" 0 1 # link to windows image |