mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-11-19 08:52:15 +00:00
c768025739
Twelve conflicts, all from xcat-core/#7970 landing. Eleven are the one sed line in the netboot postinstall profiles, where #7970 and this branch replaced the same line with different patterns. Master's wins: it anchors on optional leading blanks and preserves a trailing comment, which this branch's `s/^SELINUX=.*$/SELINUX=disabled/` would have eaten. This branch's own postinstall_selinux_config.bats asserts "the comment that names permissive keeps its text", so the better pattern is the one its test already wanted -- 6 of 6 pass on master's version. What master's pattern does not catch is a value outside enforcing|permissive, which nothing here tests and no stock config ships. The twelfth is .github/workflows/xcat_test.yml: master added a step to the existing job and this branch adds a whole selinux_policy_test job after it. Resolved as the union, with master's step where it put it; the file still parses and names three jobs. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>