From 120f4a44512b52eae8dba44a700589f8d51ce9d8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 1 Mar 2024 15:10:56 +0100 Subject: [PATCH] test74: create ssh empty dir all at the same place A follow up for 8fddb50fd4de43993c4906baf19dae89ff8a021b, which mirrors the change also in test 74. --- test/units/testsuite-74.ssh.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/units/testsuite-74.ssh.sh b/test/units/testsuite-74.ssh.sh index 3372ec0b068..70fb9ce56ca 100755 --- a/test/units/testsuite-74.ssh.sh +++ b/test/units/testsuite-74.ssh.sh @@ -24,8 +24,6 @@ if [[ -v ASAN_OPTIONS ]] ; then fi ROOTID=$(mktemp -u) -# Needed on Ubuntu/Debian as we copy binaries manually -mkdir -p /run/sshd removesshid() { rm -f "$ROOTID" "$ROOTID".pub @@ -49,7 +47,7 @@ echo "LogLevel DEBUG3" >> /etc/ssh/sshd_config test -f /etc/ssh/ssh_config || echo 'Include /etc/ssh/ssh_config.d/*.conf' > /etc/ssh/ssh_config # ssh wants this dir around, but distros cannot agree on a common name for it, let's just create all that are aware of distros use -mkdir -p /usr/share/empty.sshd /var/empty /var/empty/sshd +mkdir -p /usr/share/empty.sshd /var/empty /var/empty/sshd /run/sshd ssh -o StrictHostKeyChecking=no -v -i "$ROOTID" .host cat /etc/machine-id | cmp - /etc/machine-id ssh -o StrictHostKeyChecking=no -v -i "$ROOTID" unix/run/ssh-unix-local/socket cat /etc/machine-id | cmp - /etc/machine-id -- 2.47.3