Merge autopkgtest-cloud:blacklist-virtio-rng into autopkgtest-cloud:master

Proposed by Brian Murray
Status: Merged
Merged at revision: 1eea3b70489e319955bac483fd2c6199454e871e
Proposed branch: autopkgtest-cloud:blacklist-virtio-rng
Merge into: autopkgtest-cloud:master
Diff against target: 19 lines (+8/-0)
1 file modified
charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh (+8/-0)
Reviewer Review Type Date Requested Status
Paride Legovini (community) Approve
Ubuntu Release Team Pending
Review via email: mp+429784@code.launchpad.net

Description of the change

Modify /etc/default/grub so that GRUB_CMDLINE_LINUX= contains "module_blacklist=virtio_rng". This needs to be done in GRUB_CMDLINE_LINUX as GRUB_CMDLINE_LINUX_DEFAULT is later set in /etc/default/grub.d/90-autopkgtest.cfg which is created by autopkgtest.

I cowboy'ed this change on one of the cloud-worker units (autopkgtest-cloud-worker/0) and created adt/ubuntu-kinetic-amd64-server-20220912.img which has the module blacklisted.

To post a comment you must log in.
Revision history for this message
Paride Legovini (paride) wrote :

LGTM, the only comment I have is we're going to hit this again if the underlying issue (LP: #1989258) isn't fixed before LL, as the workaround is specific to kinetic. This can also be seen as a positive thing: if still not fixed in kernel we should bring the issue up again.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh
index 1201fb2..b53dfac 100644
--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh
+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh
@@ -25,6 +25,14 @@ if [ "$(uname -m)" = aarch64 ] && ! grep -q 'GRUB_CMDLINE_LINUX.*nohz-off' /etc/
25 update-grub25 update-grub
26fi26fi
2727
28# work around hung tasks timeout w/ virtio_rng (LP: #1989258)
29if grep -q kinetic /etc/lsb-release; then
30 if [ "$(uname -m)" = x86_64 ] && ! grep -q 'GRUB_CMDLINE_LINUX=.*module_blacklist=virtio_rng' /etc/default/grub; then
31 sed -i '/GRUB_CMDLINE_LINUX=/ s/="\(.*\)"$/="\1 module_blacklist=virtio_rng"/' /etc/default/grub
32 update-grub
33 fi
34fi
35
28# work around broken tty on ppc64el instances (LP: #1607075)36# work around broken tty on ppc64el instances (LP: #1607075)
29if [ "$(uname -m)" = ppc64le ] && [ "$(systemctl is-active keyboard-setup.service 2>/dev/null|| true)" = failed ]; then37if [ "$(uname -m)" = ppc64le ] && [ "$(systemctl is-active keyboard-setup.service 2>/dev/null|| true)" = failed ]; then
30 systemctl reset-failed keyboard-setup.service38 systemctl reset-failed keyboard-setup.service

Subscribers

People subscribed via source and target branches