diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2025-07-22 16:21:37 +1000 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2025-07-22 23:49:43 +0200 |
| commit | 79de81ef6fb04327f76faf4f17ce1fcb298275f5 (patch) | |
| tree | 915cf7e20775f8d6cda9a6925cc7727b3239dc65 | |
| parent | 3757ea36d8aa4f40119d66646a3ccaafc670d6b4 (diff) | |
| download | passt-79de81ef6fb04327f76faf4f17ce1fcb298275f5.tar passt-79de81ef6fb04327f76faf4f17ce1fcb298275f5.tar.gz passt-79de81ef6fb04327f76faf4f17ce1fcb298275f5.tar.bz2 passt-79de81ef6fb04327f76faf4f17ce1fcb298275f5.tar.lz passt-79de81ef6fb04327f76faf4f17ce1fcb298275f5.tar.xz passt-79de81ef6fb04327f76faf4f17ce1fcb298275f5.tar.zst passt-79de81ef6fb04327f76faf4f17ce1fcb298275f5.zip | |
test: Deal with /bin, /sbin unification in Fedora
Fedora is apparently merging /bin and /sbin together [0]. At least some of
this has landed in Fedora 42, with sshd and dhclient now being in /bin.
They are symlinked from /sbin, but mbuto doesn't preserve that symlink when
it builds its image, it just puts them in /bin. That breaks later parts
of the script which expects to find sshd and dhclient in /sbin. Other
parts of the test also expect sysctl in /sbin.
Use mbuto's LINKS feature to deal with these cases.
[0] https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
| -rwxr-xr-x | test/passt.mbuto | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/passt.mbuto b/test/passt.mbuto index 5e00132..176cf3f 100755 --- a/test/passt.mbuto +++ b/test/passt.mbuto @@ -28,7 +28,10 @@ KMODS="${KMODS:- virtio_net virtio_pci vmw_vsock_virtio_transport}" LINKS="${LINKS:- ash,dash,bash /init - ash,dash,bash /bin/sh}" + ash,dash,bash /bin/sh + sshd /usr/sbin/sshd + dhclient /usr/sbin/dhclient + sysctl /usr/sbin/sysctl}" DIRS="${DIRS} /tmp /usr/sbin /usr/share /var/log /var/lib /etc/ssh /run/sshd /root/.ssh" |