Don't use SLX_* variable name for local stuff

6 files changed, 16 insertions, 16 deletions

diff --git a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/run-virt.include b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/run-virt.include
index b15015ee..391ba5a5 100644
--- a/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/run-virt.include
+++ b/core/modules/qemu/data/opt/openslx/vmchooser/plugins/qemukvm/run-virt.include
@@ -104,7 +104,7 @@ run_plugin() {
 	notempty VM_MAC_ADDR       && VIRTCMDOPTS+=( "-vmmac0"      "${VM_MAC_ADDR}" )
 	notempty vm_diskfile       && VIRTCMDOPTS+=( "-vmhdd0"      "${vm_diskfile}" )
 	                              VIRTCMDOPTS+=( "-vmfloppy0"   "${FLOPPY_0}" )
-	notempty SLX_FLOPPY_IMG    && VIRTCMDOPTS+=( "-vmfloppy1"   "${SLX_FLOPPY_IMG}" )
+	notempty floppy_img        && VIRTCMDOPTS+=( "-vmfloppy1"   "${floppy_img}" )
 	notempty CDROM_0           && VIRTCMDOPTS+=( "-vmcdrom0"    "${CDROM_0}" )
 	notempty CDROM_1           && VIRTCMDOPTS+=( "-vmcdrom1"    "${CDROM_1}" )
 	notempty SERIAL0 && [ -w "${SERIAL0}" ] \
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 52817f2f..3b1d9f18 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
@@ -3,13 +3,13 @@
 ##############################################
 ## Functions ##
 setup_virtual_floppy() {
-	declare -rg SLX_FLOPPY_IMG="${TMPDIR}/floppy.img"
+	declare -rg floppy_img="${TMPDIR}/floppy.img"
 	declare -r TMPHOME="${HOME}"
 
 	# 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}" || mkdosfs "${SLX_FLOPPY_IMG}"
+	dd "if=/dev/zero" "of=${floppy_img}" count=1440 bs=1024
+	chmod 0600 "${floppy_img}"
+	mkfs.fat "${floppy_img}" || mkdosfs "${floppy_img}"
 	
 	if [ -s "${TMPHOME}/.openslx/shares" ]; then
 		$(safesource "${TMPHOME}/.openslx/shares")
@@ -174,7 +174,7 @@ setup_virtual_floppy() {
 		writelog "WARNING: Floppydir contains $size kb of data, will most likely not fit..."
 	fi
 	
-	if ! mcopy -s -i "${SLX_FLOPPY_IMG}" "${FLOPPYDIR}"/* "::/"; then
+	if ! mcopy -s -i "${floppy_img}" "${FLOPPYDIR}"/* "::/"; then
 		writelog "Error creating floppy image from ${FLOPPYDIR}"
 	elif ! $DEBUG; then
 		rm -rf -- "${FLOPPYDIR}"
diff --git a/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/create_vbox_config.inc b/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/create_vbox_config.inc
index c1c59804..a724a6e7 100755
--- a/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/create_vbox_config.inc
+++ b/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/create_vbox_config.inc
@@ -4,7 +4,7 @@
 create_vbox_config() {
 	# generate random machine/floppies UUIDs
 	declare -rg MACHINE_UUID="$(gen_uuid)"
-	declare -rg SLX_FLOPPY_UUID="$(gen_uuid)"
+	declare -rg floppy_uuid="$(gen_uuid)"
 
 	cat <<EOF > "${VBOX_ROOT}/VirtualBox.xml"
 <VirtualBox xmlns="http://www.virtualbox.org/" version="1.12-linux">
@@ -29,7 +29,7 @@ create_vbox_config() {
 		<MediaRegistry>
 			<HardDisks/>
 			<FloppyImages>
-				<Image uuid="{${SLX_FLOPPY_UUID}}" location="${SLX_FLOPPY_IMG}"/>
+				<Image uuid="{${floppy_uuid}}" location="${floppy_img}"/>
 			</FloppyImages>
 		</MediaRegistry>
 		<NetserviceRegistry>
diff --git a/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/finalize_machine_config.inc b/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/finalize_machine_config.inc
index a7a992c3..65c0b300 100755
--- a/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/finalize_machine_config.inc
+++ b/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/finalize_machine_config.inc
@@ -63,7 +63,7 @@ setup_floppies() {
 	# add the slx floppy to the second drive
 	add_node \
 		'/VirtualBox/Machine//StorageControllers/StorageController/AttachedDevice[@device="1"]' "Image" \
-		"uuid={${SLX_FLOPPY_UUID}}"
+		"uuid={${floppy_uuid}}"
 }
 
 setup_optical_drives() {
diff --git a/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/log_config_summary.inc b/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/log_config_summary.inc
index 408259a1..398ae5dc 100755
--- a/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/log_config_summary.inc
+++ b/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/log_config_summary.inc
@@ -18,7 +18,7 @@ log_config_summary() {
 	writelog ""
 	writelog "\tCD-ROM1:\t\t${CDROM0}"
 	writelog "\tFloppy A:\t\t${FLOPPY0}"
-	writelog "\tFloppy B:\t\t${SLX_FLOPPY_IMG}"
+	writelog "\tFloppy B:\t\t${floppy_img}"
 	writelog "\tShared Folders:\t\t'${HOME_SHARE_NAME}' -> '${HOME_SHARE_PATH}'"
 }
 
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 da03a1ba..f1d83fb6 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
@@ -74,11 +74,11 @@ setup_optical_drives() {
 }
 
 setup_floppies() {
-	local SLX_FLOPPY
-	if isset SLX_FLOPPY_IMG; then
-		SLX_FLOPPY="TRUE"
+	local floppy_bool
+	if isset floppy_img; then
+		floppy_bool="TRUE"
 	else
-		SLX_FLOPPY="FALSE"
+		floppy_bool="FALSE"
 	fi
 	(
 	# Floppies:
@@ -99,10 +99,10 @@ setup_floppies() {
 		HEREEND
 	fi
 	cat <<-HEREEND
-		floppy1.present = "$SLX_FLOPPY"
+		floppy1.present = "$floppy_bool"
 		floppy1.startConnected = "TRUE"
 		floppy1.fileType = "file"
-		floppy1.fileName = "$SLX_FLOPPY_IMG"
+		floppy1.fileName = "$floppy_img"
 	HEREEND
 	) >> "$TMPCONFIG"
 }