Watchdog settings are set per machine now

common.xml

@@ -466,7 +466,9 @@ CONSOLE="${CONSOLE}"
 ROOT_DEVICE="${ROOT_DEVICE}"
 DISK="${DISK}"
 SECONDARY="${SECONDARY}"
-export LC_ALL PATH PROJECT_NAME ID PRETTY_NAME HOSTNAME VERSION BUILD_ID ARTIFACT_NAME DEVICE_TYPE CONSOLE ROOT_DEVICE DISK SECONDARY HOSTTYPE
+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 CONSOLE ROOT_DEVICE DISK SECONDARY SHUTDOWN_WATCHDOG RUNTIME_WATCHDOG HOSTTYPE
 
 mount -o remount,rw /
 

machines/E2-6110/definition.xml

@@ -13,6 +13,8 @@
  <property name="BOARD" value="e2-6110"/>
  <property name="DEVICE_TYPE" value="E26110"/>
  <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
 
  <target name="run-system-e2-6110">
   <antcall target="run-system-opteron-g4"/>

machines/I3-540/definition.xml

@@ -13,6 +13,8 @@
  <property name="BOARD" value="i3-540"/>
  <property name="DEVICE_TYPE" value="I3540"/>
  <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
 
  <target name="run-system-i3-540">
   <antcall target="run-system-nehalem"/>

machines/I5-3317U/definition.xml

@@ -13,6 +13,8 @@
  <property name="BOARD" value="i5-3317u"/>
  <property name="DEVICE_TYPE" value="I53317U"/>
  <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
 
  <target name="run-system-i5-3317u">
   <antcall target="run-system-ivybridge"/>

machines/I5-8500/definition.xml

@@ -13,6 +13,8 @@
  <property name="BOARD" value="i5-8500"/>
  <property name="DEVICE_TYPE" value="I58500"/>
  <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
 
  <target name="run-system-i5-8500">
   <antcall target="run-system-skylake-client"/>

machines/I7-2600/definition.xml

@@ -13,6 +13,8 @@
  <property name="BOARD" value="i7-2600"/>
  <property name="DEVICE_TYPE" value="I72600"/>
  <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
 
  <target name="run-system-i7-2600">
   <antcall target="run-system-sandybridge"/>

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

@@ -13,6 +13,8 @@
  <property name="BOARD" value="orange-pi-pc-plus"/>
  <property name="DEVICE_TYPE" value="OrangePiPCPlusonSD"/>
  <property name="GOARCH" value="arm"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
 
  <target name="run-system-orange-pi-pc-plus">
   <antcall target="run-system-armv7"/>

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

@@ -13,6 +13,8 @@
  <property name="BOARD" value="orange-pi-plus-2e"/>
  <property name="DEVICE_TYPE" value="OrangePiPlus2EonSD"/>
  <property name="GOARCH" value="arm"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
 
  <target name="run-system-orange-pi-plus-2e">
   <antcall target="run-system-armv7"/>

machines/QEMU-KVM64/definition.xml

@@ -13,6 +13,8 @@
  <property name="BOARD" value="qemu-kvm64"/>
  <property name="DEVICE_TYPE" value="KVM64"/>
  <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
 
  <target name="run-system-qemu-kvm64">
   <antcall target="run-system-x86_64"/>

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

@@ -13,6 +13,8 @@
  <property name="BOARD" value="raspberry-pi-3-b"/>
  <property name="DEVICE_TYPE" value="RaspberryPi3ModelB"/>
  <property name="GOARCH" value="arm64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="15s"/>
+ <property name="RUNTIME_WATCHDOG" value="15s"/>
 
  <target name="run-system-raspberry-pi-3-b">
   <antcall target="run-system-armv8"/>

machines/XEON-5130/definition.xml

@@ -13,6 +13,8 @@
  <property name="BOARD" value="xeon-5130"/>
  <property name="DEVICE_TYPE" value="XEON5130"/>
  <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
 
  <target name="run-system-xeon-5130">
   <antcall target="run-system-core2"/>

machines/XEON-E3-1271/definition.xml

@@ -13,6 +13,8 @@
  <property name="BOARD" value="xeon-e3-1271"/>
  <property name="DEVICE_TYPE" value="XEONE31271"/>
  <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
 
  <target name="run-system-xeon-e3-1271">
   <antcall target="run-system-haswell"/>

machines/XEON-E5620/definition.xml

@@ -13,6 +13,8 @@
  <property name="BOARD" value="xeon-e5620"/>
  <property name="DEVICE_TYPE" value="XEONE5620"/>
  <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
 
  <target name="run-system-xeon-e5620">
   <antcall target="run-system-westmere"/>

machines/XEON-X5650/definition.xml

@@ -13,6 +13,8 @@
  <property name="BOARD" value="xeon-x5650"/>
  <property name="DEVICE_TYPE" value="XEONX5650"/>
  <property name="GOARCH" value="amd64"/>
+ <property name="SHUTDOWN_WATCHDOG" value="16s"/>
+ <property name="RUNTIME_WATCHDOG" value="16s"/>
 
  <target name="run-system-xeon-x5650">
   <antcall target="run-system-westmere"/>