mirror of
				https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
				synced 2025-11-04 09:05:59 +00:00 
			
		
		
		
	Revert aarch64 plymouth install workaround
We put it back in comps, so this should now be unnecessary.
This commit is contained in:
		
							parent
							
								
									108fb457c6
								
							
						
					
					
						commit
						c76f4a525a
					
				@ -137,9 +137,7 @@ sub run {
 | 
			
		||||
    # there are various things we might have to do at a console here
 | 
			
		||||
    # before we actually reboot. let's figure them all out first...
 | 
			
		||||
    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 && !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
 | 
			
		||||
@ -181,11 +179,6 @@ sub run {
 | 
			
		||||
        # regenerate the bootloader config
 | 
			
		||||
        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) {
 | 
			
		||||
         # Chroot in the newly installed system and switch on ABRT systemwide
 | 
			
		||||
         assert_script_run "chroot $mount abrt-auto-reporting 1";
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user