mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-11-20 01:12:18 +00:00
23afd1bae6
site.master may carry a port. format_syslog_forward_target in xCAT/postscripts/syslog bracketed any value containing a colon, so MASTER=127.0.0.1:1515 rendered the rsyslog line as @[127.0.0.1:1515], which rsyslog does not accept, and syslog_ng_udp_driver chose udp6 for an IPv4 peer. format_syslog_server in the dracut_105 rsyslogd-start.sh carries its own copy of the rule and had the same defect; it runs inside the initramfs and cannot source the postscript, so the rule is held down twice on purpose. An IPv4 address or a hostname with a port has exactly one colon and an IPv6 literal has at least two, so the test is now on two colons rather than one. A value already starting with "[" is left alone whether or not a port follows it, which the old pattern missed: it required a trailing "]" and so double-bracketed [2001:db8::1]:514. ipv6_syslog_forwarding.bats gains four cases. Without the fix, "a target with a port is not mistaken for an IPv6 literal", "an already-bracketed target with a port is left alone" and "the initrd launcher does not mistake a port for an IPv6 literal" all fail; the compressed-literal case passes either way and is there to show the bracketing of ::1 did not regress. Also: grub2_ipv6.t could not load grub2.pm once xcat-core/#7980 made it use xCAT::DHCP::BootPolicy, which lives in perl-xCAT. The file died at compile time and reported no plan at all, which in a prove summary reads as a count discrepancy rather than a failure. It now puts perl-xCAT and the server perl directory on @INC, as every other plugin test does. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>