F34+: disable systemd-oomd during update install (#1931034)

This will avoid us hitting a crash in systemd during update when
systemd is being updated. That's a real bug and it's good that
it's been caught, but we don't want unrelated updates to fail on
this just because systemd is in the update set.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-03-08 14:01:46 -08:00
parent ac9edb4cfb
commit 21385361ed

View File

@ -588,6 +588,13 @@ sub _repo_setup_updates {
unless (get_var("TEST") eq "support_server" && $version ne get_var("CURRREL")) { unless (get_var("TEST") eq "support_server" && $version ne get_var("CURRREL")) {
assert_script_run 'printf "[advisory]\nname=Advisory repo\nbaseurl=file:///opt/update_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0" > /etc/yum.repos.d/advisory.repo'; assert_script_run 'printf "[advisory]\nname=Advisory repo\nbaseurl=file:///opt/update_repo\nenabled=1\nmetadata_expire=3600\ngpgcheck=0" > /etc/yum.repos.d/advisory.repo';
# run an update now (except for upgrade tests) # run an update now (except for upgrade tests)
my $relnum = get_release_number;
if ($relnum > 33) {
# FIXME workaround https://bugzilla.redhat.com/show_bug.cgi?id=1931034
# drop after https://github.com/systemd/systemd/pull/18915 is merged
# and stable
script_run "systemctl stop systemd-oomd";
}
script_run "dnf -y update", 900 unless (get_var("UPGRADE")); script_run "dnf -y update", 900 unless (get_var("UPGRADE"));
} }
# mark via a variable that we've set up the update/task repo and done # mark via a variable that we've set up the update/task repo and done