diff options
| -rw-r--r-- | initrd/initrd-stuff/etc/vmware-prep | 58 | ||||
| -rwxr-xr-x | vmware/runvmware | 2 | ||||
| -rw-r--r-- | vmware/win98config | 2 | ||||
| -rw-r--r-- | vmware/winconfig | 2 |
4 files changed, 32 insertions, 32 deletions
diff --git a/initrd/initrd-stuff/etc/vmware-prep b/initrd/initrd-stuff/etc/vmware-prep index 1edb19d5..36e484fc 100644 --- a/initrd/initrd-stuff/etc/vmware-prep +++ b/initrd/initrd-stuff/etc/vmware-prep @@ -9,7 +9,7 @@ # Dirk von Suchodoletz <dirk@goe.net>, 10-05-2006 # Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg # -# Version: 0.2c +# Version: 0.2d ################################################################################ @@ -28,22 +28,33 @@ ### VARIABLES SECTION ########################################################## # Declaration of default variables -vmdir="/var/lib/vmware" -path="/var/X11R6/bin" +vmdir=/var/lib/vmware +path=/var/X11R6/bin sessions= session_name= ### FUNCTIONS SECTION ########################################################## +# unionfs used? +pathtest () { + if `touch /usr/X11R6/bin/touch >/dev/null 2>&1`; then + path=/usr/X11R6/bin/ + rm ${path}/touch >/dev/null 2>&1 + else + test -d ${path} || mkdir -p ${path} + fi +} + + # loop file for exchanging information between linux and vmware mount_loop () { modprobe loop >/dev/null 2>&1 - mkdir -p /media/loop0 + mkdir -p /tmp/loop0 cp ${vmdir}/templ/fd0.img /tmp/${clientip}-fd0.img chmod a+rw /tmp/${clientip}-fd0.img mount -n -t msdos -o loop,umask=000 /tmp/${clientip}-fd0.img \ - /media/loop0 + /tmp/loop0 } @@ -57,28 +68,14 @@ vmnet () { # special start script for vmware with predefined image -Xpath () { - if `touch /usr/X11R6/bin/touch >/dev/null 2>&1`; then - rm /usr/X11R6/bin/touch >/dev/null 2>&1 - path="/usr/X11R6/bin" - cp ${vmdir}/templ/runvmware \ - /usr/X11R6/bin - chmod 755 /usr/X11R6/bin/runvmware >/dev/null 2>&1 +copyscript () { + # runvmware + cp ${vmdir}/templ/runvmware ${path} + chmod 755 ${path}/runvmware >/dev/null 2>&1 - # default kdm session. Xdialog with WM and VMware images - cp ${vmdir}/templ/defaultwm /usr/X11R6/bin/defaultwm - chmod 755 /usr/X11R6/bin/defaultwm >/dev/null 2>&1 - else - path="/var/X11R6/bin" - test -d /var/X11R6/bin || mkdir -p /var/X11R6/bin - cp ${vmdir}/templ/runvmware \ - /var/X11R6/bin - chmod 755 /var/X11R6/bin/runvmware >/dev/null 2>&1 - - # default kdm session. Xdialog with WM and VMware images - cp ${vmdir}/templ/defaultwm /var/X11R6/bin/defaultwm - chmod 755 /var/X11R6/bin/defaultwm >/dev/null 2>&1 - fi + # default kdm session. Xdialog with WM and VMware images + cp ${vmdir}/templ/defaultwm ${path}/defaultwm + chmod 755 ${path}/defaultwm >/dev/null 2>&1 } @@ -88,9 +85,9 @@ desktop_session () { \n# set to black background\nxsetroot -solid \"black\"\n startvm=\$(echo \$0 | sed -e \"s,.*/,,\") - xterm -bg black -fg white -geometry 170x30+0-0 +sb \ + xterm -bg black -fg white -geometry 80x30+0-0 +sb \ -e \"${path}/runvmware -s \${startvm} ${debug}\"\n" \ - > ${path}/desktop-session + > ${path}/desktop-session chmod 755 ${path}/desktop-session } @@ -117,11 +114,14 @@ vmsession2desktop_session () { # rechtzeitig fuer gdm/kdm verfuegbar) #mount -t nfs -o ro,nolock,intr,nodev,soft,timeo=2,nosuid ${imgsrv} ${vmdir} +# check path +pathtest + # device creation - the module does not trigger udev properly vmnet # special start script for vmware with predefined image -Xpath +copyscript # loop file for exchanging information between linux and vmware guest mount_loop diff --git a/vmware/runvmware b/vmware/runvmware index df07c7a6..5923d32a 100755 --- a/vmware/runvmware +++ b/vmware/runvmware @@ -284,7 +284,7 @@ Image options: --vmostype <vmwareos> define VMware ostype --include <includefile> include code right before program start --displayaliases aliases you can use with option -a - --floppyb use /media/loop0 as floppy B, + --floppyb use /tmp/loop0 as floppy B, needed for exchanging files w/ VMware VMware options: --run <program> specify programm, e.g. vmware, vmplayer, ... diff --git a/vmware/win98config b/vmware/win98config index 41317687..56211746 100644 --- a/vmware/win98config +++ b/vmware/win98config @@ -37,6 +37,6 @@ echo -e "\tREGEDIT4\r \"username\"=\"${USER}\"\r \"PrimaryProvider\"=\"Microsoft Network\"\r \"LMLogon\"=hex:00,00,00,00\r" \ -> /media/loop0/logon.reg +> /tmp/loop0/logon.reg sync diff --git a/vmware/winconfig b/vmware/winconfig index a703ed15..676fe141 100644 --- a/vmware/winconfig +++ b/vmware/winconfig @@ -34,6 +34,6 @@ echo -e "<?xml version=\"1.0\" encoding=\"utf-8\"?>\r </username> </eintrag>\r </settings>\r" \ -> /media/loop0/config.xml +> /tmp/loop0/config.xml sync |