From b8182c10272f94a9af27a896435f48909ef38dea Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 12 Dec 2022 16:18:42 +0100
Subject: [run-virt] mkfs.vfat makes FAT32, which we don't want for a floppy

---
 .../data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/modules/run-virt/data/opt/openslx')

diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
index a07298cb..52817f2f 100644
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/run-virt.d/setup_virtual_floppy.inc
@@ -9,7 +9,7 @@ setup_virtual_floppy() {
 	# create floppy disk file + filesystem
 	dd "if=/dev/zero" "of=${SLX_FLOPPY_IMG}" count=1440 bs=1024
 	chmod 0600 "${SLX_FLOPPY_IMG}"
-	mkfs.fat "${SLX_FLOPPY_IMG}" || mkfs.vfat "${SLX_FLOPPY_IMG}" || mkdosfs "${SLX_FLOPPY_IMG}"
+	mkfs.fat "${SLX_FLOPPY_IMG}" || mkdosfs "${SLX_FLOPPY_IMG}"
 	
 	if [ -s "${TMPHOME}/.openslx/shares" ]; then
 		$(safesource "${TMPHOME}/.openslx/shares")
@@ -184,9 +184,9 @@ setup_virtual_floppy() {
 ## MAIN ##
 # Sanity checks #
 # Check if we have any filesystem tool
-if ! check_dep --oneof mkfs.fat mkfs.vfat mkdosfs; then
+if ! check_dep --oneof mkfs.fat mkdosfs; then
 	# no tools found in minilinux, this means no floppy/openslx.exe will be supported
-	slxlog "virt-fstool-missing" "Could not find any of 'mkfs.fat', 'mkfs.vfat', 'mkdosfs'!"
+	slxlog "virt-fstool-missing" "Could not find any of 'mkfs.fat', 'mkdosfs'!"
 	writelog "Could not find any filesystem-related tools to create the floppy's filesystem with!"
 	error_user "Konnte kein virtuelles Floppy anlegen! Setzen der Auflösung oder Einhängen von Netzwerkfreigaben werden nicht funktionieren. Bitte kontaktieren Sie den Support."
 	# still continue as this is not really critical
-- 
cgit v1.2.3-55-g7522