diff options
| author | Volker Uhrig | 2008-01-17 16:37:51 +0100 |
|---|---|---|
| committer | Volker Uhrig | 2008-01-17 16:37:51 +0100 |
| commit | f26786f0a972342b9e7a263d4cfcab9390ae3ef4 (patch) | |
| tree | bd93b32bfe9dea27e2075982e01f722ad48dff57 /initramfs | |
| parent | * it is now possible to cause slxconfig-demuxer to use the (diff) | |
| download | core-f26786f0a972342b9e7a263d4cfcab9390ae3ef4.tar.gz core-f26786f0a972342b9e7a263d4cfcab9390ae3ef4.tar.xz core-f26786f0a972342b9e7a263d4cfcab9390ae3ef4.zip | |
Fix order of menus in xdialog
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1481 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index 2b7a4cf2..9b4836b8 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -384,7 +384,11 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then >>/mnt/etc/X11/sessions/default.desktop echo "Type=Application" >>/mnt/etc/X11/sessions/default.desktop - # /usr/share/xsessions/* files for the menu + # all virtual machine clients in xdialog + cat ${vmdir}/xdialog-files/${pool}/*.xdialog \ + >>/mnt/var/X11R6/bin/xdialog.sh + + # /usr/share/xsessions/* files for the xdialog menu for i in /mnt/usr/share/xsessions/*.desktop; do # execute echo "\"$(grep '^Exec=' ${i}|sed 's/^Exec=//')\" \\" \ @@ -396,9 +400,6 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then echo "\"$(grep '^Comment=' ${i}|sed 's/^Comment=//')\" \\" \ >>/mnt/var/X11R6/bin/xdialog.sh done - # all virtual machine clients - cat ${vmdir}/xdialog-files/${pool}/*.xdialog \ - >>/mnt/var/X11R6/bin/xdialog.sh # closing bracket as last line ends with '\' echo ")" >>/mnt/var/X11R6/bin/xdialog.sh chmod 755 /mnt/var/X11R6/bin/xdialog.sh |