From 2a2063f3783c5fc5cb5390aa382d3b5caab20724 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Fri, 26 May 2006 18:28:39 +0000
Subject: default entry for X session ...

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@239 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/bin/servconfig | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index dfbfa05f..630bdefb 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -284,13 +284,9 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then
   # define a variable where gdm/kdm should look for additional sessions
   export vmsessions=/var/lib/vmware/vmsessions
   # create default.desktop for kdm
-  echo '[Desktop Entry]
-  Encoding=UTF-8
-  Name=Default
-  Name[de]=Standard
-  Exec=defaultwm
-  TryExec=/usr/X11R6/bin/defaultwm
-  Type=Application' >/mnt/etc/X11/sessions/default.desktop
+  echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Default\n\
+Name[de]=Standard\nExec=defaultwm\nTryExec=/var/X11R6/bin/defaultwm\n\
+Type=Application" >/mnt/etc/X11/sessions/default.desktop
 fi
 
 #######################################################################
@@ -398,7 +394,7 @@ resmgr revoke nobody\nresmgr logout tty7\nkillall X" \
 /var/X11R6/bin/kiosk &>/dev/null &" >>/mnt/etc/${D_INITDIR}/boot.ld
       cp /etc/startgui /mnt/var/X11R6/bin
       chmod a+x /mnt/var/X11R6/bin/kiosk /mnt/var/X11R6/bin/startgui
-      rm /mnt/tmp/kiosk 2>/dev/null
+      rm /mnt/var/run/kiosk 2>/dev/null
     ;;
   esac
   # enable runlevel 5 (X11 gui under SuSE linux)
-- 
cgit v1.2.3-55-g7522