Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix encrypted booting for ppc64le #5771

Merged
merged 1 commit into from
Sep 14, 2018
Merged

Fix encrypted booting for ppc64le #5771

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion lib/bootloader_setup.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,9 @@ sub boot_local_disk {
record_info 'bounce back to inst-bootmenu, send ret again';
send_key 'ret';
}
assert_screen [qw(inst-slof bootloader grub2 inst-bootmenu)];
my @tags = qw(inst-slof bootloader grub2 inst-bootmenu);
push @tags, 'encrypted-disk-password-prompt' if (get_var('ENCRYPT'));
assert_screen(\@tags);
if (match_has_tag 'grub2') {
diag 'already in grub2, returning from boot_local_disk';
stop_grub_timeout;
Expand All @@ -194,6 +196,11 @@ sub boot_local_disk {
type_string_very_slow "boot /pci\t/sc\t5";
save_screenshot;
}
if (match_has_tag 'encrypted-disk-password-prompt') {
# It is possible to show encrypted prompt directly by pressing 'local' boot-menu
# Simply return and do enter passphrase operation in cheking block of sub wait_boot
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo s/cheking/checking/

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#5829

return;
}
}
send_key 'ret';
}
Expand Down