From 510662c1ec4ca15bcf8d9b9c17658047afee0a33 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 17 Jan 2019 08:35:30 -0800 Subject: [PATCH] Drop all RHBZ #1663040 workarounds, should be fixed now In Fedora-Rawhide-20190117.n.0 #1663040 should be fixed, so drop all workarounds for it. Signed-off-by: Adam Williamson --- templates | 4 +--- tests/_boot_to_anaconda.pm | 11 ----------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/templates b/templates index 54d151bb..4b40887c 100755 --- a/templates +++ b/templates @@ -4421,9 +4421,7 @@ { key => "LIVE", value => "1" }, { key => "PACKAGE_SET", value => "default" }, { key => "DESKTOP", value => "gnome" }, - { key => "TEST_TARGET", value => "ISO" }, - # FIXME this is a workaround for RHBZ #1663040 / #1666083 - { key => "GRUB", value => "enforcing=0" } + { key => "TEST_TARGET", value => "ISO" } ], version => "*", }, diff --git a/tests/_boot_to_anaconda.pm b/tests/_boot_to_anaconda.pm index 69af96b8..92cdc7ba 100644 --- a/tests/_boot_to_anaconda.pm +++ b/tests/_boot_to_anaconda.pm @@ -49,17 +49,6 @@ sub run { } else { # on lives, we have to explicitly launch anaconda if (get_var('LIVE')) { - if (get_var('DESKTOP') eq 'gnome') { - # workaround RHBZ #1663040 if necessary - assert_screen "live_start_anaconda_icon", 300; - $self->root_console(timeout=>30); - unless (script_run "systemctl is-failed systemd-hostnamed.service") { - record_soft_failure "systemd-hostnamed.service failed - likely RHBZ #1663040"; - assert_script_run "setenforce Permissive"; - assert_script_run "systemctl restart systemd-hostnamed.service"; - } - desktop_vt; - } assert_and_click "live_start_anaconda_icon", '', 300; } my $language = get_var('LANGUAGE') || 'english';