vmware added to servconfig + vmw runtime issues + vmw bugfixes

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@247 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 17 insertions, 10 deletions

diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index bb39e72a..42b1be77 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -77,6 +77,7 @@ cp /etc/machine-setup.new /etc/machine-setup
 # * VM images via additional mount (mount source NFS, NBD, ...)
 
 if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
+  testmkd /mnt/var/lib/vmware
   # mount the vmware image source or link it (compatibility to ver. 3)
   if [ -d /mnt/usr/share/vmware ] ; then
     ln -sf /usr/share/vmware /mnt/var/lib/vmware
@@ -290,7 +291,7 @@ config_nscd
 # create needed directories and files
 if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
   # in the future other types of sources besides NFS should be supported
-  for i in /var/lib/vmware /etc/vmware/vmnet1 /etc/vmware/vmnet8 \
+  for i in /var/X11R6/bin /etc/vmware/vmnet1 /etc/vmware/vmnet8 \
            /var/run/vmware /etc/X11/sessions ; do
     testmkd /mnt/$i
   done
@@ -300,7 +301,7 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
   #  ln -sf /usr/share/vmware /var/lib/vmware
   #elif [ -n "${imgsrv}" ] ; then
   #  # more general mount script should be used here!?
-  #  ( nfsmnt ${imgsrv} /mnt/var/lib/vmware || error "$scfg_nfs" nonfatal ) &
+  #  ( nfsmnt ${imgsrv} /mnt/var/lib/vmware || error "$scfg_nfs" nonfatal ) #&
   #fi
   # generate a runlevel script
   d_mkrlscript init vmware-prep "Starting preparation of vmware environment"
@@ -308,6 +309,9 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
     /mnt/etc/${D_INITDIR}/vmware-prep
   d_mkrlscript close vmware-prep ""
   chmod u+x /mnt/etc/${D_INITDIR}/vmware-prep
+  # check here that mount finished and the important files are available
+  waitfor /mnt/var/lib/vmware/templ 10000 || \
+    error "$scfg_vmdir" nonfatal
   cp /mnt/var/lib/vmware/templ/runvmware /mnt/var/X11R6/bin
   chmod 755 /mnt/var/X11R6/bin/runvmware >/dev/null 2>&1
   config_vmware
@@ -321,17 +325,19 @@ Type=Application" >/mnt/etc/X11/sessions/default.desktop
   rm /mnt/etc/vmware/not_configured 2>/dev/null
   # add special sessions to the display managers session menu
   # check here that mount finished and the important files are available
-  waitfor 5000 /mnt/var/lib/vmware/templ/runvmware || \
-    error "$scfg_vmdir" nonfatal
+  #waitfor /mnt/var/lib/vmware/templ/runvmware 10000 || \
+  #  error "$scfg_vmdir" nonfatal
   # default kdm session. Xdialog with WM and VMware images
+  cp /mnt/var/lib/vmware/templ/runvmware /mnt/var/X11R6/bin
+  chmod 755 /mnt/var/X11R6/bin/runvmware >/dev/null 2>&1
   cp /mnt/var/lib/vmware/templ/defaultwm /mnt/var/X11R6/bin
   chmod 755 /mnt/var/X11R6/bin/defaultwm >/dev/null 2>&1
   echo -e "#!/bin/sh\n#\n# file generated by ${0} at ${date}\
     \n# set to black background\nxsetroot -solid \"black\"\
     \nstartvm=\$(echo \$0 | sed -e \"s,.*/,,\")\
     \nxterm -bg black -fg white -geometry 100x30+0-0 +sb \
-    -e \"/var/X11R6/bin/runvmware -s \${startvm} ${debug}\"\n" \
-    > /mnt/var/X11R6/bin/desktop-session
+    -e \"/var/X11R6/bin/runvmware -s \${startvm}\"\n" \
+    > /mnt/var/X11R6/bin/desktop-session #${debug} removed
   chmod 755 /mnt/var/X11R6/bin/desktop-session
   sessions=$(ls /mnt/var/lib/vmware/vmsessions/*.desktop 2>/dev/null)
   # fixme: the following part is to be tested!!
@@ -426,10 +432,11 @@ $0: $date\n:0 local /usr/X11R6/bin/X :0 vt07\n" >/mnt/etc/X11/xdm/Xservers
       init="7:5:respawn:/var/X11R6/bin/kiosk /dev/tty7"
       echo -e "#!/bin/sh\n# /var/X11R6/bin/kiosk - file generated by $0: \
 $date\nsleep 3; while ps aux|grep -i kiosk|grep -v \"grep\" &>/dev/null;\
-do\n  test -f /var/run/kiosk || break; sleep 3;\ndone\n\
-touch /var/run/kiosk
-resmgr login nobody tty7\nresmgr grant nobody desktop\nchown nobody \
-/dev/dsp* /dev/audio* /dev/mixer*\nsu -c 'xinit /var/X11R6/bin/startgui \
+do\n  test -f /var/run/kiosk || break; sleep 3;\ndone\ntouch \
+ /var/run/kiosk\nresmgr login nobody tty7\nresmgr grant nobody desktop\n\
+chown nobody /dev/dsp* /dev/audio* /dev/mixer* /dev/snd/control*\n\
+tar -zxvf /var/lib/vmware/templ/nobodyconf.tar.gz -C /var/lib/nobody\n\
+chown -R nobody.nobody /var/lib/nobody\nsu -c 'xinit /var/X11R6/bin/startgui \
 $start_x -- vt7 -quiet' -l nobody &>/dev/null\nrm /var/run/kiosk\n\
 resmgr revoke nobody\nresmgr logout tty7\nkillall X" \
         >/mnt/var/X11R6/bin/kiosk