summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2019-10-10 11:45:25 +0200
committerJonathan Bauer2019-10-10 11:45:25 +0200
commita66f49b224d1cbb2a16e9f479548cfddf450a5ba (patch)
tree69f171e9a172318978511ed8cb0ebbde7fc12c08
parent[vbox-src] fix snapshot always added to the xml (diff)
downloadmltk-a66f49b224d1cbb2a16e9f479548cfddf450a5ba.tar.gz
mltk-a66f49b224d1cbb2a16e9f479548cfddf450a5ba.tar.xz
mltk-a66f49b224d1cbb2a16e9f479548cfddf450a5ba.zip
[vbox-src] properly set the attached disk uuid
-rwxr-xr-xcore/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/finalize_machine_config.inc12
1 files changed, 6 insertions, 6 deletions
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 057032a8..a0cb8960 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
@@ -22,13 +22,13 @@ setup_disk_image() {
# set snapshot dir
set_attr "/VirtualBox/Machine" "snapshotFolder" "${VBOX_SNAPSHOT_DIR}"
-
- # there should only be exactly one <AttachedDevice> node from the xml
- # retrieved from the server
- set_attr \
- "/VirtualBox/Machine/StorageControllers/StorageController/AttachedDevice/Image" \
- "uuid" "{${SNAPSHOT_UUID}}"
fi
+
+ # "attach" VBOX_HDD_UUID (either the snapshot's or the disk's)
+ # NOTE: exactly one <AttachedDevice> node should be present in the downloaded xml
+ set_attr \
+ "/VirtualBox/Machine/StorageControllers/StorageController/AttachedDevice/Image" \
+ "uuid" "{${VBOX_HDD_UUID}}"
}
setup_floppies() {