mirror of
https://github.com/xcat2/xcat-core.git
synced 2026-09-21 08:33:20 +00:00
ff20388fed
A compute node fetches the legacy Genesis kernel and initramfs, the kernel starts, and then nothing else happens: doxcat never runs, the node acquires no address, sshd refuses every connection and the node stays at status=powering-on. The five genesis test cases in xCAT-test/autotest/testcase/genesis have never passed. VersatusHPC/xcat-internal#78. Three holes in the image, each fatal on its own. dracut_105/el/xcat-cmdline.sh ends in `while :; do tmux attach-session -t doxcat || tmux new-session -s doxcat doxcat; done`, and the image carries no locale data, so tmux exits with "need UTF-8 locale" and the loop spins without ever reaching doxcat. module-setup.sh does not install /usr/libexec/openssh/sshd-session, which OpenSSH 9.8 and later exec for every connection and which EL9 now ships. xCAT-genesis-base.spec does not BuildRequire dhcp-client, so dhclient is absent from the build chroot; dracut_install reports the missing binary and returns, and the module install function keeps going, so the image ships without it. xcat-cmdline.sh now resolves xcat_console_mode() once and runs doxcat directly when the terminal multiplexer cannot start a session; the same shape replaces the screen loop on Ubuntu. module-setup.sh installs the OpenSSH session helpers and the C.utf8 locale where they exist. The spec BuildRequires dhcp-client on the releases that package it, and runs the new xCAT-genesis-builder/verify-genesis-payload over the extracted payload, which fails the build when sshd needs a helper the image lacks, when tmux has no UTF-8 locale, or when a binary the caller named is missing. The same runs exposed four defects in the test cases themselves. test.sh defined its synthetic node as ppc64le whatever the management node was, so nodeset could not find a genesis kernel on x86_64. genesistest.pl get_os() matched neither AlmaLinux nor Rocky and reported the OS as unsupported. The -g check read $? instead of check_genesis_file()'s return value, so it could never fail. And testxdsh() met "REMOTE HOST IDENTIFICATION HAS CHANGED" from the second boot on, because Genesis makes new host keys every boot and nothing dropped the stale known_hosts entry. test.sh now derives the node arch from uname and takes the tftp root from TFTPDIR, get_os() recognises the redhat family, report_genesis_files() carries the result to an exit status, and forget_host_keys() runs makeknownhosts -r before each probe. Tests: genesis_console_mode.t drives xcat_console_mode() with the multiplexer shadowed; genesis_payload_verification.t drives the verifier over payload trees carrying each hole; genesis_testcase_helpers.t drives get_os(), check_genesis_file(), report_genesis_files() and testxdsh(); genesis_incorrectmasterip_check.t runs test.sh against a scratch tftp root. Each fails on the parent commit. The verifier also reports all three holes against the released xCAT-genesis-base-x86_64-2.19.0-snap202609021858 payload. Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com> (cherry picked from commit cb6021eb3cdb3abc75e4dd6704cb42b28074e140) Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
64 lines
2.0 KiB
Bash
Executable File
64 lines
2.0 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# verify-genesis-payload <payload-root> [required-path ...]
|
|
#
|
|
# dracut_install() reports a missing binary and returns, so the module install function keeps
|
|
# going and the image ships without it. Three such holes reached a release: no dhclient, no
|
|
# sshd-session and no UTF-8 locale. Check the extracted payload before it becomes an rpm.
|
|
#
|
|
# Paths are relative to <payload-root>. The caller adds what only it knows (dhclient is not
|
|
# packaged on every release); the rules below come from the payload itself.
|
|
|
|
set -u
|
|
|
|
payload=${1:-}
|
|
if [ -z "$payload" ] || [ ! -d "$payload" ]; then
|
|
echo "verify-genesis-payload: not a payload directory: ${payload:-<empty>}" >&2
|
|
exit 2
|
|
fi
|
|
shift
|
|
|
|
missing=""
|
|
|
|
# have PATH: true when the payload carries PATH as a file, following the usr-merge symlinks
|
|
# the image ships (/sbin -> usr/sbin).
|
|
have() {
|
|
[ -e "$payload/$1" ]
|
|
}
|
|
|
|
require() {
|
|
local path=$1 why=$2
|
|
have "$path" || missing="$missing
|
|
$path ($why)"
|
|
}
|
|
|
|
for path in "$@"; do
|
|
require "$path" "required by the build"
|
|
done
|
|
|
|
require usr/sbin/sshd "Genesis is reached over ssh"
|
|
|
|
# OpenSSH 9.8 split the per-connection work into sshd-session, which sshd execs by absolute
|
|
# path. EL9 carries OpenSSH 9.9, so an image with sshd alone refuses every connection.
|
|
if have usr/sbin/sshd && grep -qa 'sshd-session' "$payload/usr/sbin/sshd" 2>/dev/null; then
|
|
if ! have usr/libexec/openssh/sshd-session && ! have usr/lib/openssh/sshd-session; then
|
|
missing="$missing
|
|
usr/libexec/openssh/sshd-session (this sshd execs it for every connection)"
|
|
fi
|
|
fi
|
|
|
|
# tmux exits under the C locale. The hook falls back to running doxcat directly, so this is
|
|
# not fatal to booting, but a Genesis shell without tmux loses the console attach.
|
|
if have usr/bin/tmux && ! have usr/lib/locale/C.utf8/LC_CTYPE; then
|
|
missing="$missing
|
|
usr/lib/locale/C.utf8/LC_CTYPE (tmux refuses to start without a UTF-8 locale)"
|
|
fi
|
|
|
|
if [ -n "$missing" ]; then
|
|
echo "verify-genesis-payload: $payload is incomplete:$missing" >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "verify-genesis-payload: $payload is complete"
|
|
exit 0
|