diff options
| author | Volker Uhrig | 2007-06-04 14:19:13 +0200 |
|---|---|---|
| committer | Volker Uhrig | 2007-06-04 14:19:13 +0200 |
| commit | a5fa94983b4c6d291d410e6d86604c9b12053764 (patch) | |
| tree | 14cf602ea3173720c44017d90e90adabd1005df4 /initramfs | |
| parent | Proper naming for recent debian release ... (diff) | |
| download | core-a5fa94983b4c6d291d410e6d86604c9b12053764.tar.gz core-a5fa94983b4c6d291d410e6d86604c9b12053764.tar.xz core-a5fa94983b4c6d291d410e6d86604c9b12053764.zip | |
fixed typo, which results in missing xdm menu entrys
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1143 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index bc9a05b6..0e768dfa 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -351,23 +351,25 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then echo -e "mount -t usbfs usbfs /proc/bus/usb 2>/dev/null" \ >> /mnt/etc/${D_INITDIR}/boot.slx # check here that mount finished and the important files are available - if [ "$noimg" = "yes" ] ; then - error "$scfg_vmdir" nonfatal - else + #if [ "$noimg" = "yes" ] ; then + # error "$scfg_vmdir" nonfatal + #else # copy runvmware for vmware images and Xdialog sessionsmenu - cp /mnt/var/lib/vmware/templ/runvmware \ - /mnt/var/X11R6/bin >/dev/null 2>&1 - fi + #cp /mnt/var/lib/vmware/templ/runvmware \ + #/mnt/var/X11R6/bin >/dev/null 2>&1 + #fi config_vmware chmod 1777 /mnt/var/run/vmware # define a variable where gdm/kdm should look for additional sessions # do we really need it? # export vmsessions=/var/lib/vmware/vmsessions + # create default.desktop for kdm echo "[Desktop Entry]" > /mnt/etc/X11/sessions/default.desktop echo "Encoding=UTF8" >> /mnt/etc/X11/sessions/default.desktop echo "Name=Default" >> /mnt/etc/X11/sessions/default.desktop echo "Name[de]=Standard" >> /mnt/etc/X11/sessions/default.desktop + #I dont like this part, but there is no simple workaround. We need to #create xdialog.sh on every box :( #echo "Exec=/var/lib/vmware/xdialog-files/${pool}/xdialog.sh" \ @@ -405,6 +407,11 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then # closing bracket as last line ends with '\' echo ")" >> /mnt/etc/X11/xdialog.sh chmod 755 /mnt/etc/X11/xdialog.sh + + # copy xdm files, so we could choose them before we log in + for i in ${vmdir}/xdmsessions/${pool}/*.desktop;do + cp ${i} /mnt/etc/X11/sessions/ + done fi # theming |