summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xvirtualization/menulist-creator2
-rw-r--r--virtualization/templates/runvmware-v28
-rw-r--r--virtualization/templates/xdialog.sh4
3 files changed, 6 insertions, 8 deletions
diff --git a/virtualization/menulist-creator b/virtualization/menulist-creator
index 1cf424d3..e203509a 100755
--- a/virtualization/menulist-creator
+++ b/virtualization/menulist-creator
@@ -204,7 +204,7 @@ for xml in *.xml;do
if [ ${active} -eq 1 -a ${xdm} = "true" ]; then
# create desktopentry
- echo -e "\nCreating runfiles for ${image} and pool ${i}\n"
+ echo -e "\nCreating xdm entry for ${image} and pool ${i}\n"
# create the desktopentry
#TODO: change it with < EOF, >> isnt nice for so much lines
echo "Desktop entry for ${image}" \
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" "" \