diff options
| author | Michael Janczyk | 2006-05-24 17:32:12 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2006-05-24 17:32:12 +0200 |
| commit | 06126c525d8634da06ef653d519b9054c0b69514 (patch) | |
| tree | 37e0268700d425531b25a8cfa7f1cfad81651b02 | |
| parent | functions file for adding splash to the initramfs ... (diff) | |
| download | core-06126c525d8634da06ef653d519b9054c0b69514.tar.gz core-06126c525d8634da06ef653d519b9054c0b69514.tar.xz core-06126c525d8634da06ef653d519b9054c0b69514.zip | |
small runvm bug + default.desktop added to serv
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@235 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 12 | ||||
| -rwxr-xr-x | vmware/runvmware | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 121a6460..2958f309 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -4,11 +4,11 @@ # for linux diskless clients (executed within initial # ramdisk) # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 21-05-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 24-05-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg # -# Version: 0.1.1b +# Version: 0.1.1c # check for configuration files to source @@ -282,6 +282,14 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then rm /mnt/etc/vmware/not_configured 2>/dev/null # define a variable where gdm/kdm should look for additional sessions export vmsessions=/var/lib/vmware/vmsessions + # create default.desktop for kdm + echo '[Desktop Entry] + Encoding=UTF-8 + Name=Default + Name[de]=Standard + Exec=defaultwm + TryExec=/usr/X11R6/bin/defaultwm + Type=Application' >/etc/X11/sessions/default.desktop fi ####################################################################### diff --git a/vmware/runvmware b/vmware/runvmware index 0d61221d..d997ffb2 100755 --- a/vmware/runvmware +++ b/vmware/runvmware @@ -4,7 +4,7 @@ # X Stations (v4) # # Author(s): Dirk von Suchodoletz <dirk@goe.net>, 18-03-2006 -# Michael Janczyk <mj0@uni-freiburg.de>, 18-05-2006 +# Michael Janczyk <mj0@uni-freiburg.de>, 24-05-2006 # Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg # last_changes=$(head $0 | grep "@" | awk -F ", " '{print $2}' \ @@ -663,12 +663,12 @@ writelog "finished\nResults:\n\tMAC:\t\t00:50:56:0D:${mac}\n\tMem:\t\t${mem} MB if [ -n "${inter}" ]; then writelog "Starting interactive mode...\c" 0 0 - menutest=$(ls ${vmsessions} | grep -x "*.desktop" 2>/dev/null | wc -l) + menutest=$(ls ${vmsessions} | grep -x ".*desktop" 2>/dev/null | wc -l) # check for session files if [ "${menutest}" = "0" ]; then writelog "\rNo sessions found in ${vmsessions} for option -i" 0 99 - writelog "Please use option -o/-s and check your configuration \n" 0 0 + writelog "Please use option -s and check your configuration \n" 0 0 exit 1 fi |