diff options
| author | Jonathan Bauer | 2019-10-09 17:35:45 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2019-10-09 17:35:45 +0200 |
| commit | 7ad33f1c7bdaeb35d729f7e059f9866c95c47abb (patch) | |
| tree | 0bdeb83b05917595febd370234afa57ffcc36096 /core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/finalize_machine_config.inc | |
| parent | [vbox-src] rework RO/RW disk image setup (diff) | |
| download | mltk-7ad33f1c7bdaeb35d729f7e059f9866c95c47abb.tar.gz mltk-7ad33f1c7bdaeb35d729f7e059f9866c95c47abb.tar.xz mltk-7ad33f1c7bdaeb35d729f7e059f9866c95c47abb.zip | |
[vbox-src] fix snapshot always added to the xml
Diffstat (limited to 'core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/finalize_machine_config.inc')
| -rwxr-xr-x | core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/finalize_machine_config.inc | 39 |
1 files changed, 19 insertions, 20 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 86264e7e..057032a8 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 @@ -3,7 +3,7 @@ ################################################################################ setup_disk_image() { - # set read-only image path and uuid + # set disk image path and uuid set_attr \ "/VirtualBox/Machine/MediaRegistry/HardDisks/HardDisk" \ "location" "${VBOX_HDD_LINK}" @@ -11,25 +11,24 @@ setup_disk_image() { "/VirtualBox/Machine/MediaRegistry/HardDisks/HardDisk" \ "uuid" "{${HDD_UUID}}" - - # add a HardDisk node for the snapshot - add_node \ - "/VirtualBox/Machine/MediaRegistry/HardDisks/HardDisk" "HardDisk" \ - "uuid={${SNAPSHOT_UUID}}" \ - "location=$VBOX_SNAPSHOT_DIR/{${SNAPSHOT_UUID}}.vdi" \ - "format=VDI" \ - "type=Normal" - - # set snapshot dir - set_attr "/VirtualBox/Machine" "snapshotFolder" "${VBOX_SNAPSHOT_DIR}" - - # set snapshot uuid - # 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}}" + if isset SNAPSHOT_UUID; then + # read-only mode, add snapshot to main disk + add_node \ + "/VirtualBox/Machine/MediaRegistry/HardDisks/HardDisk" "HardDisk" \ + "uuid={${SNAPSHOT_UUID}}" \ + "location=$VBOX_SNAPSHOT_DIR/{${SNAPSHOT_UUID}}.vdi" \ + "format=VDI" \ + "type=Normal" + + # 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 } setup_floppies() { |