From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202506 header.b=tDP6qmQe; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 48FA85A0282 for ; Tue, 22 Jul 2025 08:21:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202506; t=1753165140; bh=Ue31IJkoCKj/k70BaksICgwdnz70MDDjZ0TlEgTn1kM=; h=From:To:Cc:Subject:Date:From; b=tDP6qmQer8O6QM8Ak8lDU+VEEznDH0w1iOn/YgRfqXcLZINQqEaga8j3quY5ZHjw2 AU9EfLanpn8+smVRsjOlk7cweqq72YtUBVEZxGxcxPjou2goHFJvAK91ai6jGehacK MaLubutLzyohdnfKiMoags3M3q/tFuXH8zfZRPkXXUHudMWidX9T2ZZwM4RNgI/gJe M06sEx7MsHZq3w5lUnV98reQqD6rogFO/rCMIELyNnKkdwBwQAPKBi+/rSxiBrTvjS 5ymMbH4ozYP+epIB2ErFBOfcmHAYvd1ujB0Cnj2Lr92SYGWZwgxXwv75Ck69nweAmL VQnjygy6KOSJA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4bmRtD5CVQz4x3p; Tue, 22 Jul 2025 16:19:00 +1000 (AEST) From: David Gibson To: passt-dev@passt.top, Stefano Brivio Subject: [PATCH] test: Deal with /bin, /sbin unification in Fedora Date: Tue, 22 Jul 2025 16:21:37 +1000 Message-ID: <20250722062137.2236874-1-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: NNSSINWPXPKJCNSEWR2GEMVCITKTF6ZP X-Message-ID-Hash: NNSSINWPXPKJCNSEWR2GEMVCITKTF6ZP X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 --- 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" -- 2.50.1