From ed91ef94ff4be99ffec6a441bf3c5fbb54b4ef8c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 20 Aug 2022 00:08:12 -0400 Subject: [PATCH] Drop systemd-oomd-defaults from Rawhide Workstation live (#2119518) Signed-off-by: Adam Williamson --- tests/_live_build.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/_live_build.pm b/tests/_live_build.pm index 0c2862db..2d273ab9 100644 --- a/tests/_live_build.pm +++ b/tests/_live_build.pm @@ -57,6 +57,12 @@ sub run { assert_script_run 'echo "repo --name=advisory --baseurl=file:///opt/update_repo" >> ' . $repoks; # and the workarounds repo assert_script_run 'echo "repo --name=workarounds --baseurl=file:///opt/workarounds_repo" >> ' . $repoks; + # FIXME: this is a workaround for #2119518, disabling oomd so it + # doesn't go crazy killing things + my $relnum = get_release_number; + if ($relnum > 37) { + assert_script_run 'sed -i -e "s,%end,-systemd-oomd-defaults\n%end,g" fedora-workstation-common.ks'; + } # now flatten the kickstart assert_script_run "ksflatten -c fedora-live-${lcsubv}.ks -o openqa.ks"; # upload the kickstart so we can check it