Handle encrypt booting in case of inst-bootmenu matched #5736
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rwx788
reviewed
Sep 10, 2018
lib/opensusebasetest.pm
Outdated
| workaround_type_encrypted_passphrase if (check_screen('encrypted-disk-password-prompt', 10)); | ||
| assert_screen('grub2'); | ||
| } | ||
| elsif (match_has_tag('encrypted-disk-password-prompt')) { |
There was a problem hiding this comment.
This can be simplified a bit by just calling check_screen on L#421 and replacing elsif with if:
if (match_has_tag('tianocore-mainmenu')) {
$self->handle_uefi_boot_disk_workaround();
# Maybe we can assert_screen here if ENCRYPT is set
check_screen('encrypted-disk-password-prompt', 10);
}
if (match_has_tag('encrypted-disk-password-prompt')) {
workaround_type_encrypted_passphrase;
assert_screen('grub2');
}
We still will have duplication with L#429, but reworking all affected needles will be too cumbersome I guess.
There was a problem hiding this comment.
Thanks, that's better enough. And workaround_type_encrypted_passphrase would check ENCRYPT var and do assert the tag again.
This fixes the encrypt booting for aarch64 and ppc64le if 'boot from harddisk' is not default in bootloader, in this case we have to handle passphrase for encrypt partition. See: https://progress.opensuse.org/issues/40601 and https://progress.opensuse.org/issues/40604
mitiao
force-pushed
the
encrypt_boot_offline_migration
branch
from
5f87f13
to
065e301
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://progress.opensuse.org/issues/40604
aarch64 - http://openqa-apac1.suse.de/tests/1680#step/boot_to_desktop/19
ppc64le - no worker to prove