summaryrefslogtreecommitdiffstats
path: root/initramfs/initrd-stuff/bin/servconfig
diff options
context:
space:
mode:
authorMichael Janczyk2007-04-04 19:13:15 +0200
committerMichael Janczyk2007-04-04 19:13:15 +0200
commite48d1da4c2d60803cdba1c5e29b139694b723415 (patch)
treef8e8aad11cf3b497e3a4e9b0edf780db1cc3eb2b /initramfs/initrd-stuff/bin/servconfig
parentminor fixes (diff)
downloadcore-e48d1da4c2d60803cdba1c5e29b139694b723415.tar.gz
core-e48d1da4c2d60803cdba1c5e29b139694b723415.tar.xz
core-e48d1da4c2d60803cdba1c5e29b139694b723415.zip
added path /var/X11R6/bin to .desktop files for KDM start.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@862 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/bin/servconfig')
-rwxr-xr-xinitramfs/initrd-stuff/bin/servconfig7
1 files changed, 4 insertions, 3 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index 0aaec294..f65ccb70 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -323,7 +323,7 @@ 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=xdmmenu\nTryExec=/var/X11R6/bin/xdmmenu\n\
+Name[de]=Standard\nExec=/var/X11R6/bin/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}\
@@ -375,7 +375,8 @@ Type=Application" >/mnt/etc/X11/sessions/default.desktop
# only show in xdm if xdmshow=true
if [ "${xdmshow}" = "true" ]; then
cd /mnt/etc/X11/sessions
- ln -s ${i#/mnt} ${i#/mnt/var/lib/vmware/vmsessions/}
+ sed -e "s,^[E|e][X|x][E|e][C|c]=[^/].*,Exec=/var/X11R6/bin/${session_name}," $i \
+ > ${i#/mnt/var/lib/vmware/vmsessions/}
xdmsessionsnr=$(expr `echo ${xdmsessionsnr}` + 1)
fi
fi
@@ -383,7 +384,7 @@ Type=Application" >/mnt/etc/X11/sessions/default.desktop
# add script vmimages.desktop only if more windowsimages than shown in xdm
if [ "${vmsessionsnr}" -gt "${xdmsessionsnr}" ]; then
echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Virtual Windows XP Menu\n\
-Name[de]=Virtual Windows XP MenĂ¼\nExec=vmmenu\nTryExec=/var/X11R6/bin/vmmenu\n\
+Name[de]=Virtual Windows XP MenĂ¼\nExec=/var/X11R6/bin/vmmenu\nTryExec=/var/X11R6/bin/vmmenu\n\
pplication" >/mnt/etc/X11/sessions/vmmenu.desktop
cd /mnt/var/X11R6/bin
ln -s desktop-session vmmenu