summaryrefslogtreecommitdiffstats
path: root/vmware
diff options
context:
space:
mode:
authorRoot2006-11-10 19:06:14 +0100
committerRoot2006-11-10 19:06:14 +0100
commitd1595cec9e0b15c8069f7c2124804e33fbd5a97a (patch)
tree3759fb8472d4f8f2d3ef614bf6eb521890ad3e24 /vmware
parentslxgrp changes (diff)
downloadcore-d1595cec9e0b15c8069f7c2124804e33fbd5a97a.tar.gz
core-d1595cec9e0b15c8069f7c2124804e33fbd5a97a.tar.xz
core-d1595cec9e0b15c8069f7c2124804e33fbd5a97a.zip
bugfix
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@507 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'vmware')
-rwxr-xr-xvmware/runvmware24
1 files changed, 12 insertions, 12 deletions
diff --git a/vmware/runvmware b/vmware/runvmware
index 9a1e0e28..8bc58946 100755
--- a/vmware/runvmware
+++ b/vmware/runvmware
@@ -4,10 +4,10 @@
# X Stations and interactive session chooser (v4)
#
# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 18-03-2006
-# Michael Janczyk <mj0@uni-freiburg.de>, 09-11-2006
+# Michael Janczyk <mj0@uni-freiburg.de>, 10-11-2006
# Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg
#
-# Version: 0.16.504
+# Version: 0.16.507
#
################################################################################
@@ -588,6 +588,16 @@ done
### STARTING ###################################################################
+# create environment
+# remove leftover locks from former runs,
+# problems may occure if you run more then one vmware with this script
+rm -f ${tmpdir}/*LOCK >/dev/null 2>&1
+rm -f ${tmpdir}/*.${debug}.log >/dev/null 2>&1
+
+# create vmware directories
+mkdir -p ${tmpdir} >/dev/null 2>&1
+mkdir -p ${vmhome} >/dev/null 2>&1
+
# NO X-server no runvmware ;)
[ -z "$DISPLAY" ] && echo -e "\n\tStart only within a desktop!\n" && exit 1
@@ -604,16 +614,6 @@ elif [ -n "${xdmstart}" -a -z "${xdm}" ]; then
\n\n\t\t\tClosing in 3 seconds."; sleep 3' && exit 1
fi
-# create environment
-# remove leftover locks from former runs,
-# problems may occure if you run more then one vmware with this script
-rm -f ${tmpdir}/*LOCK >/dev/null 2>&1
-rm -f ${tmpdir}/*.${debug}.log >/dev/null 2>&1
-
-# create vmware directories
-mkdir -p ${tmpdir} >/dev/null 2>&1
-mkdir -p ${vmhome} >/dev/null 2>&1
-
# if not interactive mode or image spezified via command line stop
if [ -z "${istart}" -a -z "${sstart}" ]; then
writelog "\n\tSpecify image to start /w -s or run interactive mode -i!\n" 0 0