mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-11-19 08:52:15 +00:00
590437c812
xcat2/xcat-core#7998. Three files carry a semantic conflict, and all three take the master side. perl-xCAT/xCAT/KVMUtils.pm and xCAT-server/lib/xcat/plugins/kvm.pm keep master's firmware_features and add_firmware_features. The two firmware APIs are mutually exclusive, and the branch's with_firmware_features and secure_boot_request were a second solution to one defect: a node that asks for firmware:efi states nothing, so libvirt selects a firmware in its own order, and that order puts a Secure Boot descriptor with enrolled keys first. xcat2/xcat-core#7973 fixes the same defect on master's API, is approved, and is in this candidate, so the branch side is dropped rather than carried beside it. xCAT-test/unit/kvm_firmware_secureboot.t is removed with them. It calls with_firmware_features and secure_boot_request, which no longer exist. xCAT-test/unit/kvm_secureboot_firmware.t covers the surviving API. xCAT-test/xcattest keeps master's xCAT::Test::Conf path. The branch routed conf parsing through xCAT::Test::OS to quote a value carrying shell syntax, which the IPv6 cells need for vmothersetting, and master already does this: chdef_command quotes what the parser returns. xCAT::Test::OS stays in the tree and xCAT-test/unit/xcattest_object_quoting.t still exercises it directly. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>