Merge autopkgtest-cloud:drop-virtiorng-blist into autopkgtest-cloud:master

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

Description of the change

We should have made this change a bit ago i.e. right when the bug was fixed.

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) :
Revision history for this message
Brian Murray (brian-murray) wrote :

I cowboy'ed this removal on the autopkgtest-cloud-workers.

Revision history for this message
Paride Legovini (paride) wrote :

LGTM, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --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
2index d23f658..c6d401c 100644
3--- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh
4+++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker-config-production/setup-canonical.sh
5@@ -19,14 +19,6 @@ EOF
6 . /etc/rc.local
7 fi
8
9-# work around hung tasks timeout w/ virtio_rng (LP: #1989258)
10-if grep -q kinetic /etc/lsb-release; then
11- if [ "$(uname -m)" = x86_64 ] && ! grep -q 'GRUB_CMDLINE_LINUX=.*module_blacklist=virtio_rng' /etc/default/grub; then
12- sed -i '/GRUB_CMDLINE_LINUX=/ s/="\(.*\)"$/="\1 module_blacklist=virtio_rng"/' /etc/default/grub
13- update-grub
14- fi
15-fi
16-
17 # work around broken tty on ppc64el instances (LP: #1607075)
18 if [ "$(uname -m)" = ppc64le ] && [ "$(systemctl is-active keyboard-setup.service 2>/dev/null|| true)" = failed ]; then
19 systemctl reset-failed keyboard-setup.service

Subscribers

People subscribed via source and target branches