From b8efd659752748c145cdf6b5f313c55d251056ae Mon Sep 17 00:00:00 2001 From: val4oss Date: Wed, 1 Oct 2025 17:32:53 +0200 Subject: [PATCH] TEST-74-AUX-UTILS: use sshd_config.d * From the TEST-74-AUX-UTILS.ssh.sh writing directly into /etc/ssh/sshd_config can hide config from distro using /usr/etc. * Using directory configuration /etc/ssh/sshd_config.d/* suits for all cases. Signed-off-by: val4oss --- test/units/TEST-74-AUX-UTILS.ssh.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/test/units/TEST-74-AUX-UTILS.ssh.sh b/test/units/TEST-74-AUX-UTILS.ssh.sh index 890763c9dc9..d18e679075c 100755 --- a/test/units/TEST-74-AUX-UTILS.ssh.sh +++ b/test/units/TEST-74-AUX-UTILS.ssh.sh @@ -43,8 +43,17 @@ usermod -U root mkdir -p /etc/ssh test -f /etc/ssh/ssh_host_rsa_key || ssh-keygen -t rsa -C '' -N '' -f /etc/ssh/ssh_host_rsa_key -echo "PermitRootLogin yes" >> /etc/ssh/sshd_config -echo "LogLevel DEBUG3" >> /etc/ssh/sshd_config + +SSHD_CONF_P="/etc/ssh/sshd_config.d/test.conf" +mkdir -p "$(basename ${SSHD_CONF_P})" +{ + echo "PermitRootLogin yes" + echo "LogLevel DEBUG3" +} >"${SSHD_CONF_P}" +rm_sshd_conf() { + rm -f "${SSHD_CONF_P}" +} +trap rm_sshd_conf EXIT test -f /etc/ssh/ssh_config || { echo 'Include /etc/ssh/ssh_config.d/*.conf'