[PATCH] test: Deal with /bin, /sbin unification in Fedora

[PATCH] test: Deal with /bin, /sbin unification in Fedora

[David Gibson]

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>
---
 test/passt.mbuto | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/passt.mbuto b/test/passt.mbuto
index 5e00132b..176cf3f7 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"
 
-- 
@@ -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"
 
-- 
2.50.1

Re: [PATCH] test: Deal with /bin, /sbin unification in Fedora

[Stefano Brivio]

On Tue, 22 Jul 2025 16:21:37 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:

> 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>
> ---
>  test/passt.mbuto | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)

Applied.

Jon, Laurent, if I recall correctly, you hit similar issues on Fedora
42 in the past (I don't remember if changes were needed on your setups
as a result). It would be good if you could try this out as well and
report back.

You would need to 'rm mbuto.img' and 'make mbuto.img' under the 'test'
directory, after applying this.

-- 
Stefano