mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-09-04 20:17:55 +00:00
Daniel Hilst
abc45b1f74
The previous commit deleted the $effective_provmethod override on the grounds that %image_hash never carries a provmethod. That was wrong, and the review caught it: makescript builds %image_hash, calls getImage() on it, and then hands the SAME hashref to getScripts(), which fills provmethod for every osimage from the osimage table. getDisklessNet() already reads that key the same way. The override was live, not dead. Restore it and say what is actually true in the comment. nodetype.provmethod is frequently an osimage name rather than 'install', and resolving it is the point of the lookup. Also close the gap that made the wrong deletion so easy to ship: reverting mkinstall's subiquity branch to its pre-fix body left the whole unit suite green. debian_mkinstall_subiquity_branch.t lifts that branch out and drives it inside a real loop, so the `next` it performs is the one under test, with report_node_error and the getipaddr seam stood in for. It calls subiquity_boot_params with no injected resolver, exactly as production does. The branch is selected out of debian.pm by what it contains rather than by where it sits -- there are four `if (using_subiquity(...))` in that file, and an earlier draft of this test silently matched the wrong one and ran past its block. Now observable, each verified by mutation: swapping $pkgdir and $httpport at the call site reddens the nfsroot assertion; reverting the branch wholesale fails the extraction guard rather than passing. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>