Revert "Resolve Conflict"

This reverts commit 05d19e3a26.
This commit is contained in:
SimonFair
2022-10-29 11:45:51 +01:00
parent 05d19e3a26
commit 826dcd0a89

View File

@@ -1188,8 +1188,6 @@
if (!$new['devices']['tpm']) unset($old['devices']['tpm']);
// remove existing auto-generated settings
unset($old['cputune']['vcpupin'],$old['devices']['video'],$old['devices']['disk'],$old['devices']['interface'],$old['devices']['filesystem'],$old['cpu']['@attributes'],$old['os']['boot'],$old['os']['loader'],$old['os']['nvram']);
// Remove old CPU cache and features
unset($old['cpu']['cache'], $old['cpu']['feature']) ;
unset($old['features']['hyperv']) ;
// set namespace
$new['metadata']['vmtemplate']['@attributes']['xmlns'] = 'unraid';