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 790BA5A026F for ; Fri, 15 Dec 2023 05:27:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1702614465; bh=BOX240uvaJZ6lj+c99FldCERmFMeGp6IYtC1skwUBTA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=M9J7aTUNh+ydPpYEqKcWezdBaVC2daNNIDsbnMQ+tfFHvsAgKNbkHIhO+UO6rCAlD +2e7TMckc6LYabgAxgv4XmUMcn0oDm9rBJheNl5JvE/1Rb4f+U+SCzNRa32FYRDdQ1 ZUDJeUHQzxO8GmJr+O0Es+G8Thyh6bq59a3WtLtlpxzRQThqSTZx2Am9vdZAa4AV+e kf3KIhRrUd0/1aWCM/wZryG2vJ4l48Y11ttUQBsp/WlLYHUnwbBgBd+7xkqvbhp1CB Z/D5EGF17Oi7HxWp4N2dktS2nF4OQnC6q9rq9dH4sOfgUT0tQDg6iBUwEFjdbACRZ9 YYYBa2S5YMaKA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4Srx5s4WR0z4wd4; Fri, 15 Dec 2023 15:27:45 +1100 (AEDT) Date: Fri, 15 Dec 2023 11:38:01 +1100 From: David Gibson To: Jon Maloy Subject: Re: [PATCH v2] test: make passt.mbuto script more robust Message-ID: References: <20231214211219.127144-1-jmaloy@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="hQEhW20AUP4MpZ+Q" Content-Disposition: inline In-Reply-To: <20231214211219.127144-1-jmaloy@redhat.com> Message-ID-Hash: F74ULXRYOAPAU254JPKVCFBICCPZMEGS X-Message-ID-Hash: F74ULXRYOAPAU254JPKVCFBICCPZMEGS 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: passt-dev@passt.top, sbrivio@redhat.com, lvivier@redhat.com, dgibson@redhat.com 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: --hQEhW20AUP4MpZ+Q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 14, 2023 at 04:12:19PM -0500, Jon Maloy wrote: > From: Jon Paul Maloy >=20 > Creation of a symbolic link from /sbin to /usr/sbin fails if /sbin > exists and is non-empty. This is the case on Ubuntu-23.04. >=20 > We fix this by removing /sbin before creating the link. >=20 > Signed-off-by: Jon Maloy >=20 > --- > v2: Move the contents of /sbin to /usr/sbin before creating the link. >=20 > Signed-off-by: Jon Maloy Reviewed-by: David Gibson > --- > test/passt.mbuto | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) >=20 > diff --git a/test/passt.mbuto b/test/passt.mbuto > index 90816d2..75d1260 100755 > --- a/test/passt.mbuto > +++ b/test/passt.mbuto > @@ -26,6 +26,9 @@ DIRS=3D"${DIRS} /tmp /sbin /usr/share /var/log /var/lib= /etc/ssh /run/sshd /root/. > COPIES=3D"${COPIES} small.bin,/root/small.bin medium.bin,/root/medium.bi= n big.bin,/root/big.bin" > =20 > FIXUP=3D"${FIXUP}"' > + mv /sbin/* /usr/sbin || : > + rm -rf /sbin > + ln -s /usr/sbin /sbin > cat > /sbin/dhclient-script << EOF > #!/bin/sh > LOG=3D/var/log/dhclient-script.log > @@ -47,7 +50,6 @@ set >> \$LOG > exit 0 > EOF > chmod 755 /sbin/dhclient-script > - ln -s /sbin /usr/sbin > ln -s /bin /usr/bin > ln -s /run /var/run > :> /etc/fstab --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --hQEhW20AUP4MpZ+Q Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmV7n9MACgkQzQJF27ox 2GeC/A/7BorfHGAlCndloKprz9K5jEONiOO3sfkzxfS38NS8han62zwMIjK7gq6I f6V5ckQOhBwqZFmCJBefzgGCsN/4G/t+lPuMVeHhfyeZmQ2UulhXivNVH6IbrVZ0 Zfpg7nyiuvlcp6uXW6vOCLaJ3FPBCnp4FcmiY1lvToh1j2w+a8tPHJ68WalWhDcw EUKSvvQ+74MF4QAJgx8mBbey6HmGRe4g6xbzfjf+Nn0zaIIVYqdZ7PMAyoBKJXve 6rXjMcn7GAXXCRrQxwsZYxbcHBpdGhvZOzK3+EWOefH378eBAp1ebYh3Xag9dMXZ fTEal4KtCM+IBxSG5anxDOCNn2cUa0EFEPKpggxIpFShGTmMomGSTPoO9F0w841z 74WC2gTw0mXbhE09ebSJ9S5thz8Id812D6IjbNrIuXcys9N867DhAYsro8Nb9YM6 fJLviYhjm9rDQ4jINY7Hr2Kj7BpjFgqYypUKHyEW5kADPI3sXrLrP5xWn6SCg5Jg KV5XkJEig0NzW7eYoW23BMHUcBj+nfm8/mHu6S3lODgFVs0fgF/VnXTOgCXH54Et i/KUFEAr9G/BXbqpO/bGQCN4SWN8vzR+WzecKoFtqYvxIZF2Z94qGP03SSLXlWQa byAKnUsaiNXuH1a0lwD7VzGI5wSD3qFVuCy7NSrmxwV26Gn21sM= =q+SZ -----END PGP SIGNATURE----- --hQEhW20AUP4MpZ+Q--