mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-09-05 04:27:55 +00:00
Daniel Hilst
b784aa782c
Two things the review found, both in code added by this branch. Reverting mkinstall's call site -- putting xCAT::NetworkUtils->getipaddr back in place of subiquity_nfsroot_server, the exact regression the fix removes -- left the entire unit suite green. The helpers were covered; nothing linked them to production. Compose the two steps in subiquity_boot_params(), which takes its inputs and returns either a command line or the reason there isn't one, so the composition can be driven; mkinstall keeps report_node_error and the loop's `next`. That same revert now reddens 6 of 9 assertions. The test stubs xCAT::NetworkUtils::getipaddr deliberately. Without it a call site that bypassed the injected resolver died on a missing module -- a red, but for the wrong reason. With it, bypassing the resolver returns the wrong answer, which is what the assertions are there to catch. The resolv.conf sandbox guard matched `/etc/` with a trailing slash, so the one respelling its own comment names -- `etcdir=/etc; rm -f "$etcdir/resolv.conf"` -- walked straight past it and the fragment would rm the runner's real resolv.conf, as root in CI. `/etc\b` catches it: applying that respelling now BAIL_OUTs instead of running. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>