diff options
| author | Volker Uhrig | 2007-06-04 16:52:48 +0200 |
|---|---|---|
| committer | Volker Uhrig | 2007-06-04 16:52:48 +0200 |
| commit | e29e9dd9e3fbaaa733dcea951c40584cdf5241d3 (patch) | |
| tree | ea9eabab7404f23061661968b9c6c0d4818aa893 /virtualization | |
| parent | fixed typo, which results in missing xdm menu entrys (diff) | |
| download | core-e29e9dd9e3fbaaa733dcea951c40584cdf5241d3.tar.gz core-e29e9dd9e3fbaaa733dcea951c40584cdf5241d3.tar.xz core-e29e9dd9e3fbaaa733dcea951c40584cdf5241d3.zip | |
Minor bugfixes/improvements
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1144 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'virtualization')
| -rwxr-xr-x | virtualization/menulist-creator | 2 | ||||
| -rw-r--r-- | virtualization/templates/runvmware-v2 | 8 | ||||
| -rw-r--r-- | virtualization/templates/xdialog.sh | 4 |
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" "" \ |