changed default session chooser and vmware image chooser.

defaultwm and kursimages were replaced through runvmware --xdm all and
--xdm vm
there is an improved error handling in runvmware, aswell.
servconfig changed due to this modifications.



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

1 files changed, 22 insertions, 25 deletions

diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index 9e592a23..9751e97a 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -5,7 +5,7 @@
 # system is setup when servconfig starts
 #
 # Dirk von Suchodoletz <dvs@OpenSLX.com>, 03-09-2006
-# Michael Janczyk <mj0>, 12-09-2006
+# Michael Janczyk <mj0>, 27-10-2006
 # Lars Mueller <lm@OpenSLX.com>, 23-06-2006
 # Oliver Tappe <ot@OpenSLX.com>, 23-06-2006
 #
@@ -299,14 +299,9 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
   if [ "$noimg" = "yes" ] ; then
     error "$scfg_vmdir" nonfatal
   else
-    # add special sessions to the display managers session menu
-    # default kdm session. Xdialog with WM and VMware images
+    # copy runvmware for vmware images and Xdialog sessionsmenu
     cp /mnt/var/lib/vmware/templ/runvmware \
       /mnt/var/X11R6/bin >/dev/null 2>&1
-    cp /mnt/var/lib/vmware/templ/defaultwm \
-      /mnt/var/X11R6/bin >/dev/null 2>&1
-    cp /mnt/var/lib/vmware/templ/kursimages \
-      /mnt/var/X11R6/bin >/dev/null 2>&1
   fi
   config_vmware
   chmod 1777 /mnt/var/run/vmware
@@ -314,37 +309,39 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
   export vmsessions=/var/lib/vmware/vmsessions
   # create default.desktop for kdm
   echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Default\n\
-Name[de]=Standard\nExec=defaultwm\nTryExec=/var/X11R6/bin/defaultwm\n\
+Name[de]=Standard\nExec=xdmmenu\nTryExec=/var/X11R6/bin/xdmmenu\n\
 Type=Application" >/mnt/etc/X11/sessions/default.desktop
   rm /mnt/etc/vmware/not_configured 2>/dev/null
   echo -e "#!/bin/sh\n#\n# file generated by ${0} at ${date}\
-    \n# set X background\
-    \nres=\$(xvidtune -show | grep -wo \"\\\".*\\\"\" | sed \"s/\\\"//g\")\
-    \nif ! [ -f /var/lib/vmware/templ/corp-id/bootsplash/silent-\${res}.jpg ]; then
-    \n  img=\$(ls /etc/bootsplash/themes/dxs/images/ | grep -m 1 \"silent\")\
-    \n  display -window root /var/lib/vmware/templ/corp-id/bootsplash/images/\${img}\
+    \n\nvmstart=\$(echo \$0 | awk -F \"/\" '{print \$NF}')\
+    \n\nif [ \"\${vmstart}\" = \"xdmmenu\" ]; then\
+    \n  /var/X11R6/bin/runvmware --xdm all\
+    \n  exit 0\
+    \nelif [ \"\${vmstart}\" = \"vmmenu\" ]; then\
+    \n  /var/X11R6/bin/runvmware --xdm vm\
+    \n  exit 0\
     \nelse\
-    \n  display -window root /var/lib/vmware/templ/corp-id/bootsplash/images/silent-\${res}.jpg\
-    \nfi
-    \nstartvm=\$(echo \$0 | sed -e \"s,.*/,,\")\
-    \n/var/X11R6/bin/runvmware -s \${startvm}\n"\
-    > /mnt/var/X11R6/bin/desktop-session #${debug} removed
-  chmod 755 /mnt/var/X11R6/bin/runvmware /mnt/var/X11R6/bin/defaultwm \
-    /mnt/var/X11R6/bin/desktop-session >/dev/null 2>&1
+    \n  /var/X11R6/bin/runvmware -s \${vmstart}\
+    \nfi\n"\
+    > /mnt/var/X11R6/bin/desktop-session
+  chmod 755 /mnt/var/X11R6/bin/runvmware /mnt/var/X11R6/bin/desktop-session \
+    >/dev/null 2>&1
   sessions=$(ls /mnt/var/lib/vmware/vmsessions/*.desktop 2>/dev/null)
   # fixme: the following part is to be tested!!
   if [ -n "${sessions}" ]; then
+    cd /mnt/var/X11R6/bin
     for i in /mnt/var/lib/vmware/vmsessions/*.desktop; do
       #session_name=$(cat ${i} | grep -iw "exec" \
       #  | awk -F "=" '{print $2}')
       session_name=$(cat ${i}|sed -n "/^[Ee]xec/p"|sed -e "s,Exec=,,")
-      # copy bacause of initrd
-      cp /mnt/var/X11R6/bin/desktop-session \
-        /mnt/var/X11R6/bin/${session_name}
-      #ln -s /mnt/var/X11R6/bin/desktop-session \
-      #  /mnt/var/X11R6/bin/${session_name}
+      # create session links so that they con be startet via xdm
+      ln -s desktop-session ${session_name}
     done
   fi
+  # add scripts for default.desktop and vmimages.desktop
+  cd /mnt/var/X11R6/bin
+  ln -s desktop-session xdmmenu
+  ln -s desktop-session vmmenu                             
 fi
 
 #######################################################################