From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by passt.top (Postfix) with ESMTPS id DB3255A026F for ; Mon, 15 Jan 2024 06:53:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1705297990; bh=fwp6kf9EmW7OlZQIl8sFzOUVbSt0QEA1JsDHEzYL8RQ=; h=From:To:Cc:Subject:Date:From; b=oDpivqMHi6AbVlftI8lRVeZOWTRa2hp+I4d+8iYJrd6lmqbzAyQKu4LNJlaMosfdQ A1Oe2fWo2ZwkRgzGgoy3Zmr9Ub4We046BhQdHW4T7sJYb8aGyGV7MJQileLQhip35g olT3y6u54F/9g8Y5gg8I5ZYPaW8ThylvL6+sx8rCukxM5lMZrJXaWwNKpPHHBa0kN9 mXEQ5Odyed9qNaPxxQpn8od2X70knxxKkfDiIDWUz2byiQ2dP0GwS0754BymRPd83i /K4XDjGOvXDDUZwtr/s10pOB7R+Ea/O1rh0QBlUBlV6a4pGY9c3aEB1EdAfgBVbakl atWLqbYO+YmIA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4TD1X60r2Yz4wqN; Mon, 15 Jan 2024 16:53:10 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH] test: Fix passt.mbuto for cases where /usr/sbin doesn't exist Date: Mon, 15 Jan 2024 16:53:08 +1100 Message-ID: <20240115055308.1005604-1-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: 5WS3VHEGFTDNPXS6IMGZKKLWYJ3TYKXZ X-Message-ID-Hash: 5WS3VHEGFTDNPXS6IMGZKKLWYJ3TYKXZ 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: f0ccca74 ("test: make passt.mbuto script more robust") is supposed to make mbuto more robust by standardizing on always putting things in /usr/sbin with /sbin a symlink to it. This matters because different distros have different conventions about how the two are used. However, the logic there requires that /usr/sbin at least exists to start with. This isn't always the case with Fedora derived mbuto images. Ironically the DIRS variable ensures that /sbin exists, although we then remove it, but doesn't require /usr/sbin to exist. Fix that up so that the new logic will work with Fedora. Fixes: f0ccca74 ("test: make passt.mbuto script more robust") Signed-off-by: David Gibson --- test/passt.mbuto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/passt.mbuto b/test/passt.mbuto index 75d1260..6240d5c 100755 --- a/test/passt.mbuto +++ b/test/passt.mbuto @@ -21,7 +21,7 @@ LINKS="${LINKS:- ash,dash,bash /init ash,dash,bash /bin/sh}" -DIRS="${DIRS} /tmp /sbin /usr/share /var/log /var/lib /etc/ssh /run/sshd /root/.ssh" +DIRS="${DIRS} /tmp /usr/sbin /usr/share /var/log /var/lib /etc/ssh /run/sshd /root/.ssh" COPIES="${COPIES} small.bin,/root/small.bin medium.bin,/root/medium.bin big.bin,/root/big.bin" -- 2.43.0