From e29e9dd9e3fbaaa733dcea951c40584cdf5241d3 Mon Sep 17 00:00:00 2001
From: Volker Uhrig
Date: Mon, 4 Jun 2007 14:52:48 +0000
Subject: Minor bugfixes/improvements

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1144 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 virtualization/templates/runvmware-v2 | 8 +++-----
 virtualization/templates/xdialog.sh   | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'virtualization/templates')

diff --git a/virtualization/templates/runvmware-v2 b/virtualization/templates/runvmware-v2
index 36260e7d..f9ecdd7f 100644
--- a/virtualization/templates/runvmware-v2
+++ b/virtualization/templates/runvmware-v2
@@ -33,11 +33,9 @@ totalmem=
 permem=66
 
 # virtual fd/cd/dvd and drive devices, floppy b: for configuration
-if [ ! -d /sys/block/fd0 ]; then
-  floppya="FALSE"
-else
-  floppya="TRUE"
-fi
+#floppya is always false, if we have a floppy device or not isn't
+#important.
+floppya="FALSE"
 floppyb="TRUE"
 floppybname="/etc/vmware/loopimg/fd.img"
 cdr_1="FALSE"
diff --git a/virtualization/templates/xdialog.sh b/virtualization/templates/xdialog.sh
index 520ac530..3fac01bf 100644
--- a/virtualization/templates/xdialog.sh
+++ b/virtualization/templates/xdialog.sh
@@ -6,7 +6,7 @@
 #TODO: change path_to_this_script to path of this file. needed, because
 #      a return will exit Xdialog
 
-exec $($(which Xdialog) --rc-file /var/lib/openslx/themes/Xdialog/gtkrc \
+$($(which Xdialog) --rc-file /var/lib/openslx/themes/Xdialog/gtkrc \
     --title "Desktop / VMware-ImageMenu" \
     --screen-center \
     --fill --no-wrap \
@@ -16,4 +16,4 @@ exec $($(which Xdialog) --rc-file /var/lib/openslx/themes/Xdialog/gtkrc \
     --item-help \
     --menubox "Please choose the image you would like to run:" \
     35 80 0 \
-    "path_to_this_script" "No Image - Don't press return too fast" "" \
+    "/etc/X11/xdialog.sh" "No Image - Don't press return too fast" "" \
-- 
cgit v1.2.3-55-g7522