diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | initrd/distro-specs/suse/functions-default | 2 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 2 | ||||
| -rw-r--r-- | theming/openslx/kdm/kdmrc | 2 | ||||
| -rwxr-xr-x | vmware/defaultwm | 4 | ||||
| -rwxr-xr-x | vmware/kursimages | 86 |
6 files changed, 94 insertions, 6 deletions
@@ -92,9 +92,9 @@ functions via\# inclusion: '. /etc/functions' ..." \ vmware_install: @echo "Installing VMware files to $(VMWARE_PATH)" @mkdir -p $(VMWARE_PATH)/templ \ - -p $(VMWARE_PATH)/vmsessions + -p $(VMWARE_PATH)/vmsessions/kdm @cp -a vmware/* $(VMWARE_PATH)/templ/ - @echo -e "Please configure your exports (add $(VMWARE_PATH) to your list).\nCopy your *.vmdk files into $(VMWARE_PATH). For interactive mode add for each virtual machine (*.vmdk) a .desktop file into ./vmsessions (example file $(VMWARE_PATH)/templ/desktop.template)." + @echo -e "Please configure your exports (add $(VMWARE_PATH) to your list).\nCopy your *.vmdk files into $(VMWARE_PATH). For interactive mode add for each virtual machine (*.vmdk) a .desktop file into ./vmsessions (example file $(VMWARE_PATH)/templ/desktop.template). Don't forget to install Xdialog!" #uninstall: # @echo -e "Uninstalling openslx.org project files but keeping configs \ diff --git a/initrd/distro-specs/suse/functions-default b/initrd/distro-specs/suse/functions-default index a2d5ba48..16b8f0e9 100644 --- a/initrd/distro-specs/suse/functions-default +++ b/initrd/distro-specs/suse/functions-default @@ -315,7 +315,7 @@ Session=/etc/X11/xdm/Xsession\nClientLogFile=.xsession-errors-%s\n\ AutoReLogin=false\nAllowRootLogin=true\n\ AllowNullPasswd=true\nAllowShutdown=All\n\ SessionsDirs=/etc/X11/sessions,/usr/share/xsessions,\ -/opt/kde3/share/apps/kdm/sessions,$vmsessions\n\ +/opt/kde3/share/apps/kdm/sessions,$vmsessions/kdm\n\ AuthNames=XDM-AUTHORIZATION-1,MIT-MAGIC-COOKIE-1\n\n\ [X-*-Greeter]\n\ ShowUsers=Selected\nSelectedUsers=\nUserList=false\n\ diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 8228773f..9e592a23 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -305,6 +305,8 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then /mnt/var/X11R6/bin >/dev/null 2>&1 cp /mnt/var/lib/vmware/templ/defaultwm \ /mnt/var/X11R6/bin >/dev/null 2>&1 + cp /mnt/var/lib/vmware/templ/kursimages \ + /mnt/var/X11R6/bin >/dev/null 2>&1 fi config_vmware chmod 1777 /mnt/var/run/vmware diff --git a/theming/openslx/kdm/kdmrc b/theming/openslx/kdm/kdmrc index 723cec0e..8f3575ff 100644 --- a/theming/openslx/kdm/kdmrc +++ b/theming/openslx/kdm/kdmrc @@ -33,7 +33,7 @@ AutoReLogin=false AllowRootLogin=true AllowNullPasswd=true AllowShutdown=All -SessionsDirs=/etc/X11/sessions,/usr/share/xsessions,/opt/kde3/share/apps/kdm/sessions,/var/lib/vmware/vmsessions +SessionsDirs=/etc/X11/sessions,/usr/share/xsessions,/opt/kde3/share/apps/kdm/sessions,/var/lib/vmware/vmsessions/kdm AuthNames=XDM-AUTHORIZATION-1,MIT-MAGIC-COOKIE-1 [X-*-Greeter] diff --git a/vmware/defaultwm b/vmware/defaultwm index bc7e05f3..d8834ef2 100755 --- a/vmware/defaultwm +++ b/vmware/defaultwm @@ -6,7 +6,7 @@ # # Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg # -# Version: 0.1.371 +# Version: 0.1.372 # ################################################################################ @@ -97,7 +97,7 @@ ${execute[${i}]:-"No comment"}" # --stderr because of 1>/dev/null # echoing to file because Xdialog sux when used w/ quotes - echo -e "Xdialog --rc-file /var/lib/vmware/templ/Xdialog/gtkrc \ + echo -e "Xdialog --rc-file /var/lib/openslx/themes/Xdialog/gtkrc \ --title \"Desktop / VMware-Image Menu\" \ --screen-center \ --fill \ diff --git a/vmware/kursimages b/vmware/kursimages new file mode 100755 index 00000000..a16b530b --- /dev/null +++ b/vmware/kursimages @@ -0,0 +1,86 @@ +#!/bin/sh +# +# Description: Session chooser for kdm/gdm +# +# Author(s): Michael Janczyk <mj0@uni-freiburg.de>, 12-09-2006 +# +# Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg +# +# Version: 0.1.372 +# +################################################################################ + + + +# set X background +res=$(xvidtune -show | grep -wo "\".*\"" | sed "s/\"//g") +if ! [ -f /var/lib/openslx/themes/bootsplash/images/silent-${res}.jpg ]; then + img=$(ls /var/lib/openslx/themes/bootsplash/images/ | grep -m 1 "silent") + display -window root /var/lib/openslx/themes/bootsplash/images/${img} +else + display -window root /var/lib/openslx/themes/bootsplash/images/silent-${res}.jpg +fi + + +x_dialog () { + + vmsessions="/var/lib/vmware/vmsessions" + tmpdir="/tmp" + menu= + execute= + + desktops=( `ls ${vmsessions}/*.desktop 2>/dev/null` ) + desktopsnr=$(echo "${#desktops[*]}") + (( args=0 )) + declare -i i=0 + + while [ "${desktopsnr}" -gt "${args}" ]; do + # exec in .desktop + execute[${i}]=$(grep -m 1 -i "exec" ${desktops[${args}]} \ + | awk -F "=" '{print $2}') + menu="$menu \"\${execute[${i}]}\"" + i=${i}+1 + + # name in .desktop + execute[${i}]=$(grep -m 1 -i "name" ${desktops[${args}]} \ + | awk -F "=" '{print $2}') + execute[${i}]=${execute[${i}]:-`echo ${execute[${i}-1]} | sed -e "s,-, ,g"`} + menu="$menu \"\${execute[${i}]}\"" + i=${i}+1 + + # comment in .desktop + execute[${i}]=$(grep -m 1 -i "comment" ${desktops[${args}]} \ + | awk -F "=" '{print $2}') + execute[${i}]=${execute[${i}]:-"No comment"} + menu="$menu \"\${execute[${i}]}\"" + i=${i}+1 + + (( args=${args}+1 )) + done + + # --stderr because of 1>/dev/null + # echoing to file because Xdialog sux when used w/ quotes + echo -e "Xdialog --rc-file /var/lib/openslx/themes/Xdialog/gtkrc \ + --title \"VMware Image Menu\" \ + --screen-center \ + --fill \ + --no-wrap \ + --stderr \ + --no-tags \ + --ok-label \"START\" \ + --item-help \ + --menubox \"Please choose the image you would like to run:\" 35 80 0 \ + $menu 1>/dev/null" \ + > ${tmpdir}/Xdialog + +. ${tmpdir}/Xdialog +rm -f ${tmpdir}/Xdialog + +} + + +args_dial=$(x_dialog 2>&1) # 2>&1, see function +exec ${args_dial} + +exit 0 + |