diff options
author | Jonathan Bauer | 2020-01-22 16:54:04 +0100 |
---|---|---|
committer | Jonathan Bauer | 2020-01-22 16:54:04 +0100 |
commit | 294ba57d7c84bcd08cd623e6b365490eb29700f1 (patch) | |
tree | 67e26088cd4f82b5fb00484fe4bc2f015679fe02 | |
parent | [kiosk-slxbrowser] PATH woes... (diff) | |
download | mltk-294ba57d7c84bcd08cd623e6b365490eb29700f1.tar.gz mltk-294ba57d7c84bcd08cd623e6b365490eb29700f1.tar.xz mltk-294ba57d7c84bcd08cd623e6b365490eb29700f1.zip |
[vmware-common] fix floppy setup
while the configuration prior to this commit worked fine for minilinux,
it lead to failures in maxilinux/stage4. This change fixes the problem
of the maxilinux without breaking it for minilinux - hence commited in
the master branch.
-rw-r--r-- | core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc index 2c5e772a..8fb672b7 100644 --- a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc +++ b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc @@ -79,18 +79,27 @@ setup_floppies() { else SLX_FLOPPY="FALSE" fi - + ( # Floppies: - cat >> "${TMPCONFIG}" <<-HEREEND - floppy0.present = "TRUE" - floppy0.startConnected = "$FLOPPY0" - floppy0.autodetect = "TRUE" - floppy0.fileName = "auto detect" - floppy1.present = "$SLX_FLOPPY" - floppy1.startConnected = "TRUE" - floppy1.fileType = "file" - floppy1.fileName = "$SLX_FLOPPY_IMG" + cat <<-HEREEND + floppy0.present = "TRUE" + floppy0.startConnected = "$FLOPPY0" + floppy0.fileType = "device" + HEREEND + if [ -b "$FLOPPY_0" ]; then + floppy0.autodetect = "FALSE" + floppy0.fileName = "$FLOPPY_0" + else + floppy0.autodetect = "TRUE" + floppy0.fileName = "auto detect" + fi + cat <<-HEREEND + floppy1.present = "$SLX_FLOPPY" + floppy1.startConnected = "TRUE" + floppy1.fileType = "file" + floppy1.fileName = "$SLX_FLOPPY_IMG" HEREEND + ) >> "$TMPCONFIG" } setup_serial() { |