mirror of
https://github.com/rocky-linux/os-autoinst-distri-rocky.git
synced 2024-12-18 17:18:30 +00:00
Install plymouth in aarch64 encrypted test (workaround #1940163)
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
48cee79928
commit
a6ea09e4d5
@ -137,7 +137,9 @@ sub run {
|
|||||||
# there are various things we might have to do at a console here
|
# there are various things we might have to do at a console here
|
||||||
# before we actually reboot. let's figure them all out first...
|
# before we actually reboot. let's figure them all out first...
|
||||||
my @actions;
|
my @actions;
|
||||||
|
my $relnum = get_release_number;
|
||||||
push (@actions, 'consoletty0') if (get_var("ARCH") eq "aarch64");
|
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, 'abrt') if (get_var("ABRT", '') eq "system");
|
push (@actions, 'abrt') if (get_var("ABRT", '') eq "system");
|
||||||
push (@actions, 'rootpw') if (get_var("INSTALLER_NO_ROOT"));
|
push (@actions, 'rootpw') if (get_var("INSTALLER_NO_ROOT"));
|
||||||
# memcheck test doesn't need to reboot at all. Rebooting from GUI
|
# memcheck test doesn't need to reboot at all. Rebooting from GUI
|
||||||
@ -179,6 +181,11 @@ sub run {
|
|||||||
# regenerate the bootloader config
|
# regenerate the bootloader config
|
||||||
assert_script_run "chroot $mount grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg";
|
assert_script_run "chroot $mount grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg";
|
||||||
}
|
}
|
||||||
|
if (grep {$_ eq 'plymouth'} @actions) {
|
||||||
|
# FIXME: install plymouth to work around #1940163
|
||||||
|
assert_script_run "chroot $mount dnf -y install plymouth", 180;
|
||||||
|
assert_script_run "chroot $mount dracut -f", 180;
|
||||||
|
}
|
||||||
if (grep {$_ eq 'abrt'} @actions) {
|
if (grep {$_ eq 'abrt'} @actions) {
|
||||||
# Chroot in the newly installed system and switch on ABRT systemwide
|
# Chroot in the newly installed system and switch on ABRT systemwide
|
||||||
assert_script_run "chroot $mount abrt-auto-reporting 1";
|
assert_script_run "chroot $mount abrt-auto-reporting 1";
|
||||||
|
Loading…
Reference in New Issue
Block a user