From 2c3241dc7538c24d62fb6cf988609e9815c8e9b4 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 23 Mar 2021 16:45:05 -0700 Subject: [PATCH] Don't do the plymouth workaround for ostree deployments ...because we don't have RPM there, Jim. Signed-off-by: Adam Williamson --- tests/_do_install_and_reboot.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm index b4937e27..2a6c191d 100644 --- a/tests/_do_install_and_reboot.pm +++ b/tests/_do_install_and_reboot.pm @@ -139,7 +139,7 @@ sub run { my @actions; my $relnum = get_release_number; push (@actions, 'consoletty0') if (get_var("ARCH") eq "aarch64"); - push (@actions, 'plymouth') if (get_var("ARCH") eq "aarch64" && get_var("ENCRYPT_PASSWORD") && $relnum > 33); + push (@actions, 'plymouth') if (get_var("ARCH") eq "aarch64" && get_var("ENCRYPT_PASSWORD") && $relnum > 33 && !get_var("CANNED")); push (@actions, 'abrt') if (get_var("ABRT", '') eq "system"); push (@actions, 'rootpw') if (get_var("INSTALLER_NO_ROOT")); # memcheck test doesn't need to reboot at all. Rebooting from GUI