diff options
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 9 | ||||
| -rw-r--r-- | os-plugins/plugins/VMware/XX_VMware.sh | 9 |
2 files changed, 10 insertions, 8 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 diff --git a/os-plugins/plugins/VMware/XX_VMware.sh b/os-plugins/plugins/VMware/XX_VMware.sh index 4dd7a8d2..ce0999b8 100644 --- a/os-plugins/plugins/VMware/XX_VMware.sh +++ b/os-plugins/plugins/VMware/XX_VMware.sh @@ -127,6 +127,10 @@ if [ -e /initramfs/plugin-conf/VMware.conf ]; then >>/mnt/etc/X11/sessions/default.desktop echo "Type=Application" >>/mnt/etc/X11/sessions/default.desktop + # all virtual machine clients + cat ${vmdir}/xdialog-files/${pool}/*.xdialog \ + >>/mnt/var/X11R6/bin/xdialog.sh + # /usr/share/xsessions/* files for the menu for i in /mnt/usr/share/xsessions/*.desktop; do # execute @@ -139,9 +143,6 @@ if [ -e /initramfs/plugin-conf/VMware.conf ]; 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 @@ -168,4 +169,4 @@ if [ -e /initramfs/plugin-conf/VMware.conf ]; then [ $DEBUGLEVEL -gt 0 ] && echo "done with 'VMware' os-plugin ..."; fi -fi
\ No newline at end of file +fi |