Skip to content

Commit

Permalink
Fix adding /boot/zipl partition on s390x
Browse files Browse the repository at this point in the history
Previously it worked with /boot due to suggested mounts, so correct
mount point was used in the end. It doesn't happen with storage-ng.

See [poo#28507](https://progress.opensuse.org/issues/28507).
  • Loading branch information
Rodion Iafarov committed Feb 1, 2018
1 parent 73353df commit 58c3237
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions tests/installation/partitioning_full_lvm.pm
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,19 @@ sub run {
# Storage-ng has GPT by defaut, so need bios-boot partition for legacy boot, which is only on x86_64
addpart(role => 'raw', fsid => 'bios-boot', size => 1);
}
if (
check_var('ARCH', 's390x') # s390x need /boot/zipl on ext partition
|| get_var('UNENCRYPTED_BOOT') # add explicitly if parameter is set
|| check_var('ARCH', 'ppc64le') && is_storage_ng # ppc with lvm requires separate boot on storage-ng
)
{
elsif (check_var('ARCH', 's390x')) {
# s390x need /boot/zipl on ext partition
addpart(role => 'OS', size => 500, format => 'ext2', mount => '/boot/zipl');
}

# ppc with lvm requires separate boot on storage-ng or if want to test with UNENCRYPTED_BOOT set to true
if (get_var('UNENCRYPTED_BOOT') || check_var('ARCH', 'ppc64le') && is_storage_ng) {
addpart(role => 'OS', size => 500, format => 'ext2', mount => '/boot');
}

addpart(role => 'raw', encrypt => 1);
assert_screen 'expert-partitioner';
send_key 'alt-s'; # select System view
send_key 'alt-s'; # select System view
send_key_until_needlematch('volume_management_feature', 'down'); # select Volume Management
send_key $cmd{addpart}; # add
wait_still_screen 2;
Expand Down

0 comments on commit 58c3237

Please sign in to comment.