From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 1 Aug 2024 11:14:52 +0000 (+0200)
Subject: test: attempt to install sshd-session from multiple places
X-Git-Tag: v256.5~1^2~47
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=2e2371c5b5353430327790aa3066060fabfdf781;p=systemd%2F.git

test: attempt to install sshd-session from multiple places

On Fedora the sshd-session binary is under /usr/libexec/openssh/ so
cover this path as well in the old framework.

Follow-up for aaa7b36bd15ca3a96a1e11a557482b0bc59c769f.

(cherry picked from commit ce2344bbee468c7d524e508a8ff7f5f7ae85acb5)
---

diff --git a/test/TEST-46-HOMED/test.sh b/test/TEST-46-HOMED/test.sh
index 06034b7d17..973b030e65 100755
--- a/test/TEST-46-HOMED/test.sh
+++ b/test/TEST-46-HOMED/test.sh
@@ -24,7 +24,7 @@ test_append_files() {
     inst_binary ssh
     inst_binary sshd
     inst_binary ssh-keygen
-    image_install -o /usr/lib/ssh/sshd-session
+    image_install -o /usr/lib/ssh/sshd-session /usr/libexec/openssh/sshd-session
 }
 
 do_test "$@"
diff --git a/test/TEST-74-AUX-UTILS/test.sh b/test/TEST-74-AUX-UTILS/test.sh
index d47a0a20f2..d9ae70c68c 100755
--- a/test/TEST-74-AUX-UTILS/test.sh
+++ b/test/TEST-74-AUX-UTILS/test.sh
@@ -31,7 +31,7 @@ test_append_files() {
     inst_binary ssh
     inst_binary sshd
     inst_binary ssh-keygen
-    image_install -o /usr/lib/ssh/sshd-session
+    image_install -o /usr/lib/ssh/sshd-session /usr/libexec/openssh/sshd-session
     inst_binary usermod
     instmods vmw_vsock_virtio_transport
     instmods vsock_loopback