[vbox-src] Loosen XPath to patch HDD UUID on 7.x

Storage section moved into Hardware now.
Support both variants by using '//'.

2 files changed, 13 insertions, 13 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 ec0e4dde..f8480cb6 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
@@ -27,34 +27,34 @@ setup_disk_image() {
 	# "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" \
+		"/VirtualBox/Machine//StorageControllers/StorageController/AttachedDevice/Image" \
 		"uuid" "{${VBOX_HDD_UUID}}"
 }
 
 setup_floppies() {
 	# add storage controller and 2 floppies to it
-	if ! node_exists '/VirtualBox/Machine/StorageControllers/StorageController[@name="Floppy"]'; then
+	if ! node_exists '/VirtualBox/Machine//StorageControllers/StorageController[@name="Floppy"]'; then
 		add_node \
-			"/VirtualBox/Machine/StorageControllers" "StorageController" \
+			"/VirtualBox/Machine//StorageControllers" "StorageController" \
 			"name=Floppy" \
 			"type=I82078" \
 			"PortCount=1" \
 			"useHostIOCache=true"
 	fi
 	add_node \
-		'/VirtualBox/Machine/StorageControllers/StorageController[@name="Floppy"]' "AttachedDevice" \
+		'/VirtualBox/Machine//StorageControllers/StorageController[@name="Floppy"]' "AttachedDevice" \
 		"type=Floppy" \
 		"hotpluggable=false" \
 		"port=0" \
 		"device=0"
 	if notempty FLOPPY_0; then
 		add_node \
-			'/VirtualBox/Machine/StorageControllers/StorageController[@name="Floppy"]/AttachedDevice[@device="0"]' \
+			'/VirtualBox/Machine//StorageControllers/StorageController[@name="Floppy"]/AttachedDevice[@device="0"]' \
 			"HostDrive" \
 			"src=${FLOPPY_0}"
 	fi
 	add_node \
-		'/VirtualBox/Machine/StorageControllers/StorageController[@name="Floppy"]' "AttachedDevice" \
+		'/VirtualBox/Machine//StorageControllers/StorageController[@name="Floppy"]' "AttachedDevice" \
 		"type=Floppy" \
 		"hotpluggable=false" \
 		"port=0" \
@@ -62,7 +62,7 @@ setup_floppies() {
 
 	# add the slx floppy to the second drive
 	add_node \
-		'/VirtualBox/Machine/StorageControllers/StorageController/AttachedDevice[@device="1"]' "Image" \
+		'/VirtualBox/Machine//StorageControllers/StorageController/AttachedDevice[@device="1"]' "Image" \
 		"uuid={${SLX_FLOPPY_UUID}}"
 }
 
@@ -73,13 +73,13 @@ setup_optical_drives() {
 	fi
 	local controller='StorageController[@type="AHCI"]'
 	local devnum=1
-	if node_exists '/VirtualBox/Machine/StorageControllers/'"$controller"; then
+	if node_exists '/VirtualBox/Machine//StorageControllers/'"$controller"; then
 		# TODO validating port count...
 		writelog "AHCI controller found, will add CDROMs to it."
 	else
 		writelog "Adding SATA controller for CDROMs."
 		add_node \
-			"/VirtualBox/Machine/StorageControllers" "StorageController" \
+			"/VirtualBox/Machine//StorageControllers" "StorageController" \
 			"name=SATA-CDROM" \
 			"type=AHCI" \
 			"PortCount=1" \
@@ -91,7 +91,7 @@ setup_optical_drives() {
 	for cdrom in $CDROM_0 $CDROM_1; do
 		writelog "Adding passthrough CDROM"
 		add_node \
-			'/VirtualBox/Machine/StorageControllers/'"$controller" "AttachedDevice" \
+			'/VirtualBox/Machine//StorageControllers/'"$controller" "AttachedDevice" \
 			"type=DVD" \
 			"passthrough=true" \
 			"hotpluggable=false" \
@@ -99,7 +99,7 @@ setup_optical_drives() {
 			"device=$devnum"
 		(( devnum ++ ))
 		add_node \
-			'/VirtualBox/Machine/StorageControllers/'"$controller"'/AttachedDevice[@type="DVD"]' "HostDrive" \
+			'/VirtualBox/Machine//StorageControllers/'"$controller"'/AttachedDevice[@type="DVD"]' "HostDrive" \
 			"src=${cdrom}"
 	done
 }
diff --git a/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/prepare_snapshot.inc b/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/prepare_snapshot.inc
index 39a20bcd..51f57273 100755
--- a/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/prepare_snapshot.inc
+++ b/core/modules/vbox-src/data/opt/openslx/vmchooser/plugins/virtualbox/includes/prepare_snapshot.inc
@@ -49,7 +49,7 @@ prepare_disk_image_ro() {
 	# TODO handle other formats...
 	# finally "register" the snapshot in the MediaRegistry
 	xmlstarlet ed -L -N x="http://www.virtualbox.org/" \
-		-s "//x:VirtualBox/x:Global/x:MediaRegistry/x:HardDisks/x:HardDisk[@uuid='{${HDD_UUID}}']" \
+		-s "/x:VirtualBox/x:Global/x:MediaRegistry/x:HardDisks/x:HardDisk[@uuid='{${HDD_UUID}}']" \
 		-t elem -n "HardDisk" --var newnode '$prev' \
 		-i '$newnode' -t attr -n "uuid" -v "{${SNAPSHOT_UUID}}" \
 		-i '$newnode' -t attr -n "location" -v "${VBOX_SNAPSHOT_DIR}/{${SNAPSHOT_UUID}}.vdi" \
@@ -88,7 +88,7 @@ prepare_disk_image() {
 
 	# add the hard disk element to the "global" VirtualBox.xml
 	xmlstarlet ed -L -N x="http://www.virtualbox.org/" \
-		-s "//x:VirtualBox/x:Global/x:MediaRegistry/x:HardDisks" \
+		-s "/x:VirtualBox/x:Global/x:MediaRegistry/x:HardDisks" \
 		-t elem -n "HardDisk" --var newnode '$prev' \
 		-i '$newnode' -t attr -n "uuid" -v "{${HDD_UUID}}" \
 		-i '$newnode' -t attr -n "location" -v "$VBOX_HDD_LINK" \