diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2024-01-15 17:39:42 +1100 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2024-01-16 21:48:31 +0100 |
| commit | f60c85194b87c6cc182b9868c9e6a6b8ac1af48f (patch) | |
| tree | 98966e8f2bc4084a10120bd77a0914974caacac6 /test/passt.mbuto | |
| parent | f091893c1ffe1a531989a599737031089f6cfcb4 (diff) | |
| download | passt-f60c85194b87c6cc182b9868c9e6a6b8ac1af48f.tar passt-f60c85194b87c6cc182b9868c9e6a6b8ac1af48f.tar.gz passt-f60c85194b87c6cc182b9868c9e6a6b8ac1af48f.tar.bz2 passt-f60c85194b87c6cc182b9868c9e6a6b8ac1af48f.tar.lz passt-f60c85194b87c6cc182b9868c9e6a6b8ac1af48f.tar.xz passt-f60c85194b87c6cc182b9868c9e6a6b8ac1af48f.tar.zst passt-f60c85194b87c6cc182b9868c9e6a6b8ac1af48f.zip | |
test: Fix passt.mbuto for cases where /usr/sbin doesn't exist
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: f0ccca741f64 ("test: make passt.mbuto script more robust")
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'test/passt.mbuto')
| -rwxr-xr-x | test/passt.mbuto | 2 |
1 files changed, 1 insertions, 1 deletions
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" |