Added BOOT_DEVICE to machine definitions

common.xml

@@ -654,11 +654,12 @@ GCC_CONFIG="${GCC_CONFIG}"
 CONSOLE="${CONSOLE}"
 ROOT_DEVICE="${ROOT_DEVICE}"
 DISK="${DISK}"
+BOOT_DEVICE="${BOOT_DEVICE}"
 BOOT_DISK="${BOOT_DISK}"
 SECONDARY="${SECONDARY}"
 SHUTDOWN_WATCHDOG="${SHUTDOWN_WATCHDOG}"
 RUNTIME_WATCHDOG="${RUNTIME_WATCHDOG}"
-export LC_ALL PATH PROJECT_NAME ID PRETTY_NAME HOSTNAME VERSION BUILD_ID ARTIFACT_NAME DEVICE_TYPE BOARD GCC_CONFIG CONSOLE ROOT_DEVICE DISK BOOT_DISK SECONDARY SHUTDOWN_WATCHDOG RUNTIME_WATCHDOG HOSTTYPE
+export LC_ALL PATH PROJECT_NAME ID PRETTY_NAME HOSTNAME VERSION BUILD_ID ARTIFACT_NAME DEVICE_TYPE BOARD GCC_CONFIG CONSOLE ROOT_DEVICE DISK BOOT_DEVICE BOOT_DISK SECONDARY SHUTDOWN_WATCHDOG RUNTIME_WATCHDOG HOSTTYPE
 
 mount -o remount,rw,discard /
 
@@ -767,11 +768,12 @@ GCC_CONFIG="${GCC_CONFIG}"
 CONSOLE="${CONSOLE}"
 ROOT_DEVICE="${ROOT_DEVICE}"
 DISK="${DISK}"
+BOOT_DEVICE="${BOOT_DEVICE}"
 BOOT_DISK="${BOOT_DISK}"
 SECONDARY="${SECONDARY}"
 SHUTDOWN_WATCHDOG="${SHUTDOWN_WATCHDOG}"
 RUNTIME_WATCHDOG="${RUNTIME_WATCHDOG}"
-export LC_ALL PATH PROJECT_NAME ID PRETTY_NAME HOSTNAME COPYRIGHT LICENSE TRANSLATOR VERSION BUILD_ID ARTIFACT_NAME DEVICE_TYPE BOARD GCC_CONFIG CONSOLE ROOT_DEVICE DISK BOOT_DISK SECONDARY SHUTDOWN_WATCHDOG RUNTIME_WATCHDOG HOSTTYPE
+export LC_ALL PATH PROJECT_NAME ID PRETTY_NAME HOSTNAME COPYRIGHT LICENSE TRANSLATOR VERSION BUILD_ID ARTIFACT_NAME DEVICE_TYPE BOARD GCC_CONFIG CONSOLE ROOT_DEVICE DISK BOOT_DEVICE BOOT_DISK SECONDARY SHUTDOWN_WATCHDOG RUNTIME_WATCHDOG HOSTTYPE
 
 mount -o remount,rw,discard /
 

machines/AMLOGIC-S905X/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="mmcblk0"/>
  <property name="DISK" value="${ROOT_DEVICE}p"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}p"/>
  <property name="SECONDARY" value="mmcblk1p"/>
  <property name="BOARD" value="amlogic-s905x"/>
  <property name="DEVICE_TYPE" value="AmLogicS905X"/>

machines/AWS/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="aws"/>
  <property name="DEVICE_TYPE" value="AWS"/>

machines/CORE2DUO-E6700/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="core2duo-e6700"/>
  <property name="DEVICE_TYPE" value="CORE2DUOE6700"/>

machines/CORE2DUO-Q9550/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="core2duo-q9550"/>
  <property name="DEVICE_TYPE" value="CORE2DUOQ9550"/>

machines/E2-6110/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="gpt"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="e2-6110"/>
  <property name="DEVICE_TYPE" value="E26110"/>

machines/I3-540/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="i3-540"/>
  <property name="DEVICE_TYPE" value="I3540"/>

machines/I5-3317U/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="gpt"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="i5-3317u"/>
  <property name="DEVICE_TYPE" value="I53317U"/>

machines/I5-8500/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="gpt"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="i5-8500"/>
  <property name="DEVICE_TYPE" value="I58500"/>

machines/I7-2600/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="gpt"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="i7-2600"/>
  <property name="DEVICE_TYPE" value="I72600"/>

machines/IWAVE-G35M/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="mmcblk0"/>
  <property name="DISK" value="${ROOT_DEVICE}p"/>
- <property name="BOOT_DISK" value="mmcblk1p"/>
+ <property name="BOOT_DEVICE" value="mmcblk1"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}p"/>
  <property name="SECONDARY" value="mmcblk1p"/>
  <property name="BOARD" value="iwave-g35m"/>
  <property name="DEVICE_TYPE" value="iWaveSystemsG35MonSD"/>

machines/LENOVO-T460S/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="gpt"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="lenovo-t460s"/>
  <property name="DEVICE_TYPE" value="LenovoT460s"/>

machines/MSI-MAG-X570/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="gpt"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="msi-mag-x570"/>
  <property name="DEVICE_TYPE" value="MSIMAGX570"/>

machines/ODROID-HC2/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="mmcblk0"/>
  <property name="DISK" value="${ROOT_DEVICE}p"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}p"/>
  <property name="SECONDARY" value="mmcblk1p"/>
  <property name="BOARD" value="odroid-hc2"/>
  <property name="DEVICE_TYPE" value="OdroidHC2oneMMC"/>

machines/ORANGE-PI-3-LTS/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="mmcblk0"/>
  <property name="DISK" value="${ROOT_DEVICE}p"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}p"/>
  <property name="SECONDARY" value="mmcblk1p"/>
  <property name="BOARD" value="orange-pi-3-lts"/>
  <property name="DEVICE_TYPE" value="OrangePi3LTSonSD"/>

machines/ORANGE-PI-PC-PLUS/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="mmcblk0"/>
  <property name="DISK" value="${ROOT_DEVICE}p"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}p"/>
  <property name="SECONDARY" value="mmcblk1p"/>
  <property name="BOARD" value="orange-pi-pc-plus"/>
  <property name="DEVICE_TYPE" value="OrangePiPCPlusonSD"/>

machines/ORANGE-PI-PLUS-2E/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="mmcblk0"/>
  <property name="DISK" value="${ROOT_DEVICE}p"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}p"/>
  <property name="SECONDARY" value="mmcblk1p"/>
  <property name="BOARD" value="orange-pi-plus-2e"/>
  <property name="DEVICE_TYPE" value="OrangePiPlus2EonSD"/>

machines/P4-630/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="p4-630"/>
  <property name="DEVICE_TYPE" value="P4630"/>

machines/QEMU-CORE2DUO/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="qemu-core2duo"/>
  <property name="DEVICE_TYPE" value="CORE2DUO"/>

machines/QEMU-KVM64/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="qemu-kvm64"/>
  <property name="DEVICE_TYPE" value="KVM64"/>

machines/QEMU-NEHALEM/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="qemu-nehalem"/>
  <property name="DEVICE_TYPE" value="NEHALEM"/>

machines/QEMU-PHENOM/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="qemu-phenom"/>
  <property name="DEVICE_TYPE" value="PHENOM"/>

machines/QEMU-SANDYBRIDGE/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="qemu-sandybridge"/>
  <property name="DEVICE_TYPE" value="SANDYBRIDGE"/>

machines/QEMU-SKYLAKE/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="qemu-skylake"/>
  <property name="DEVICE_TYPE" value="SKYLAKE"/>

machines/QEMU-WESTMERE/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="qemu-westmere"/>
  <property name="DEVICE_TYPE" value="WESTMERE"/>

machines/QEMU-ZEN2/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="qemu-zen2"/>
  <property name="DEVICE_TYPE" value="ZEN2"/>

machines/RASPBERRY-PI-3-B/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="mmcblk0"/>
  <property name="DISK" value="${ROOT_DEVICE}p"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}p"/>
  <property name="SECONDARY" value="mmcblk1p"/>
  <property name="BOARD" value="raspberry-pi-3-b"/>
  <property name="DEVICE_TYPE" value="RaspberryPi3ModelB"/>

machines/RASPBERRY-PI-4-B/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="mmcblk0"/>
  <property name="DISK" value="${ROOT_DEVICE}p"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}p"/>
  <property name="SECONDARY" value="mmcblk1p"/>
  <property name="BOARD" value="raspberry-pi-4-b"/>
  <property name="DEVICE_TYPE" value="RaspberryPi4ModelB"/>

machines/TERASIC-DE10-STANDARD/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="mmcblk0"/>
  <property name="DISK" value="${ROOT_DEVICE}p"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="mmcblk1p"/>
  <property name="BOARD" value="terasic-de10-standard"/>
  <property name="DEVICE_TYPE" value="TerasicDE10Standard"/>

machines/X4-945/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="x4-945"/>
  <property name="DEVICE_TYPE" value="X4945"/>

machines/XEON-5130/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="gpt"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="xeon-5130"/>
  <property name="DEVICE_TYPE" value="XEON5130"/>

machines/XEON-E3-1271/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="gpt"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="xeon-e3-1271"/>
  <property name="DEVICE_TYPE" value="XEONE31271"/>

machines/XEON-E5504/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="mbr"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="xeon-e5504"/>
  <property name="DEVICE_TYPE" value="XEONE5504"/>

machines/XEON-E5620/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="gpt"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="xeon-e5620"/>
  <property name="DEVICE_TYPE" value="XEONE5620"/>

machines/XEON-SILVER-4310/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="gpt"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="xeon-silver-4310"/>
  <property name="DEVICE_TYPE" value="XEONSILVER4310"/>

machines/XEON-X5650/definition.xml

@@ -9,7 +9,8 @@
  <property name="DISK_LABEL" value="gpt"/>
  <property name="ROOT_DEVICE" value="sda"/>
  <property name="DISK" value="${ROOT_DEVICE}"/>
- <property name="BOOT_DISK" value="${DISK}"/>
+ <property name="BOOT_DEVICE" value="${ROOT_DEVICE}"/>
+ <property name="BOOT_DISK" value="${BOOT_DEVICE}"/>
  <property name="SECONDARY" value="sdb"/>
  <property name="BOARD" value="xeon-x5650"/>
  <property name="DEVICE_TYPE" value="XEONX5650"/>