diff options
| author | Simon Rettberg | 2024-01-03 15:41:56 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2024-01-03 15:41:56 +0100 |
| commit | aa636371a079061e7ba685db1ebc8ecaea0733f8 (patch) | |
| tree | e845cd5a34cfde429758e6b9cbba205a9220e556 /core/modules/vbox-src | |
| parent | [rootfs-stage32] Remove unused bariable (diff) | |
| download | mltk-aa636371a079061e7ba685db1ebc8ecaea0733f8.tar.gz mltk-aa636371a079061e7ba685db1ebc8ecaea0733f8.tar.xz mltk-aa636371a079061e7ba685db1ebc8ecaea0733f8.zip | |
Don't use SLX_* variable name for local stuff
Diffstat (limited to 'core/modules/vbox-src')
3 files changed, 4 insertions, 4 deletions
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}'" } |