From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Brivio To: passt-dev@passt.top Subject: [PATCH 5/5] test/distro: Update workarounds for Ubuntu 22.04 on s390x Date: Fri, 23 Sep 2022 02:53:27 +0200 Message-ID: <20220923005327.1000042-6-sbrivio@redhat.com> In-Reply-To: <20220923005327.1000042-1-sbrivio@redhat.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2693692764257219504==" --===============2693692764257219504== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable If we use dhclient without creating a complete network configuration, systemd-resolved will stop working after a while, and this sometimes happens while we're still installing packages. Disable it, together with systemd-networkd, while taking care of removing the dhclient hook that prevents overriding /etc/resolv.conf. While at it, it looks like removing snapd and needrestart actually takes more time than keeping them: drop that line. Signed-off-by: Stefano Brivio --- test/distro/ubuntu | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/distro/ubuntu b/test/distro/ubuntu index aa42c99..343fa03 100644 --- a/test/distro/ubuntu +++ b/test/distro/ubuntu @@ -191,7 +191,9 @@ test Ubuntu 22.04 (Jammy Jellyfish), s390x host ./qrap 5 qemu-system-s390x -m 2048 -smp 2 -serial stdio -nodefaults -no= graphic __BASEPATH__/prepared-jammy-server-cloudimg-s390x.img -net socket,fd= =3D5 -net nic,model=3Dvirtio -device virtio-rng-ccw -snapshot =20 host export DEBIAN_FRONTEND=3Dnoninteractive -host apt-get -y remove needrestart snapd +host service systemd-networkd stop +host service systemd-resolved stop +host rm /etc/dhcp/dhclient-enter-hooks.d/resolved-enter host dhclient -4 dns_ready_wait host apt-get update --=20 2.35.1 --===============2693692764257219504==--