From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH] test: Deal with /bin, /sbin unification in Fedora
Date: Tue, 22 Jul 2025 16:21:37 +1000 [thread overview]
Message-ID: <20250722062137.2236874-1-david@gibson.dropbear.id.au> (raw)
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
next reply other threads:[~2025-07-22 6:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-22 6:21 David Gibson [this message]
2025-07-22 21:52 ` [PATCH] test: Deal with /bin, /sbin unification in Fedora Stefano Brivio
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250722062137.2236874-1-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).