From 00a02c9dff76a1416c51c58b9514e520c3f633ec Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Mon, 15 May 2006 15:43:11 +0000
Subject: few changes, testcommit

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@212 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/etc/vmware-prep | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'initrd/initrd-stuff')

diff --git a/initrd/initrd-stuff/etc/vmware-prep b/initrd/initrd-stuff/etc/vmware-prep
index effcb056..e33952aa 100644
--- a/initrd/initrd-stuff/etc/vmware-prep
+++ b/initrd/initrd-stuff/etc/vmware-prep
@@ -5,11 +5,11 @@
 #               environment. Start and stop functionality is added within
 #		initial ramdisk
 #
-# Author(s):    Michael Janczyk <mj0@uni-freiburg.de>, 04-04-2006
+# Author(s):    Michael Janczyk <mj0@uni-freiburg.de>, 15-04-2006
 #               Dirk von Suchodoletz <dirk@goe.net>, 10-05-2006
 # Copyright:    (c) 2003, 2006 - RZ Universitaet Freiburg
 #
-# Version:      0.2b
+# Version:      0.2c
 ################################################################################
 
 
@@ -64,12 +64,20 @@ Xpath () {
     cp ${vmdir}/templ/runvmware \
        /usr/X11R6/bin
     chmod 755 /usr/X11R6/bin/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
 }
 
@@ -77,6 +85,7 @@ Xpath () {
 # blabla sessiondinens
 desktop_session () {
   echo -e "#!/bin/sh\n#\n# file generated by\n#\t${0}:\n#\t${date}\n
+  # set to black background\nxsetroot -solid "black"\n  
   os=\$(echo \$0 | sed -e \"s,-, ,;s,.*/,,\" | awk '{print \$1}')
   spec=\$(echo \$0 | sed -e \"s,-, ,;s,.*/,,\" | awk '{print \$2}')\n
   options=\"-o \${os} \${spec:+\"-s \${spec}\"}\"\n
@@ -90,7 +99,7 @@ desktop_session () {
 
 # copy nach blabla
 vmsession2desktop_session () {
-  sessions=$(ls ${vmdir}/vmsessions/*.desktop)
+  sessions=$(ls ${vmdir}/vmsessions/*.desktop 2>/dev/null)
   if [ -n "${sessions}" ]; then
     for i in ${vmdir}/vmsessions/*.desktop; do
       session_name=$(cat ${i} | grep -iw "exec" \
@@ -126,8 +135,3 @@ desktop_session
 # copy nach blabla
 vmsession2desktop_session
 
-# 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
-
-
-- 
cgit v1.2.3-55-g7522