diff options
Diffstat (limited to 'remote/modules/vmware/data/opt')
2 files changed, 15 insertions, 7 deletions
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc index 1d6b2185..7418a053 100644 --- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc @@ -168,8 +168,11 @@ create_vmware_config_file_legacy() { [ "$mem" -ge "$MAXMEM" ] && mem="$MAXMEM" [ "$hwver" -lt "7" -a "$mem" -gt "3500" ] && mem="3500" - cap3d="WHAT IS THIS VAR USED FOR?" # helper var for loging output - + if [ -n "$FLOPPYIMG" ]; then + floppy1="TRUE" + else + floppy1="FALSE" + fi cat >> "$conffile" <<-HEREEND .encoding = "UTF-8" @@ -182,8 +185,6 @@ create_vmware_config_file_legacy() { monitor.virtual_mmu = "automatic" monitor.virtual_exec = "automatic" - floppy1.clientDevice = "FALSE" - floppy1.readonly = "TRUE" # id virtualHW.version = "$hwver" @@ -224,15 +225,16 @@ create_vmware_config_file_legacy() { # floppies floppy0.present = "$floppy0" - floppy0.startConnected = "FALSE" + floppy0.startConnected = "TRUE" floppy0.autodetect = "TRUE" floppy0.fileName = "auto detect" # we need floppy b: for the client configuration floppy1.present = "$floppy1" + floppy1.readonly = "TRUE" floppy1.startConnected = "TRUE" floppy1.fileType = "file" - floppy1.fileName = "$floppy1name" + floppy1.fileName = "$FLOPPYIMG" # nics ethernet0.present = "TRUE" diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc index 092abce5..cdc2710c 100644 --- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc @@ -30,6 +30,12 @@ ide1:1.fileName = "auto detect" ide1:1.deviceType = "cdrom-raw" HEREEND +if [ -n "$FLOPPYIMG" ]; then + floppy1="TRUE" +else + floppy1="FALSE" +fi + # Floppies: cat >> "$TMPDIR/$IMGUUID" <<-HEREEND floppy0.present = "$floppy0" @@ -39,7 +45,7 @@ floppy0.fileName = "auto detect" floppy1.present = "$floppy1" floppy1.startConnected = "TRUE" floppy1.fileType = "file" -floppy1.fileName = "$floppy1name" +floppy1.fileName = "$FLOPPYIMG" HEREEND writelog "numvcpus = ${cpu_cores} - maxvcpus=${real_core_count}" |