Simplify the blivet resize LVM testcase

I don't think we need an alternative needle for ppc - the
current 'boot_inactive' needle should work fine on ppc. Let's
just always use that.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2023-06-18 13:00:07 +02:00
parent 426747c368
commit 30563c6aed
2 changed files with 2 additions and 7 deletions

View File

@ -128,7 +128,7 @@ for user in ("jack", "jim"):
testtags.append(f"user_confirm_{user}") testtags.append(f"user_confirm_{user}")
# partitioning stuff, there's a bunch of this, all in anaconda.pm # partitioning stuff, there's a bunch of this, all in anaconda.pm
# multiple things use this # multiple things use this
for part in ("swap", "root", "efi", "boot", "bootefi", "home", "vda2"): for part in ("swap", "root", "efi", "boot", "bootefi", "home"):
testtags.append(f"anaconda_part_select_{part}") testtags.append(f"anaconda_part_select_{part}")
testtags.append(f"anaconda_blivet_part_inactive_{part}") testtags.append(f"anaconda_blivet_part_inactive_{part}")
# select_disks # select_disks

View File

@ -42,12 +42,7 @@ sub run {
} }
# Select the boot partition and reformat it and remount. # Select the boot partition and reformat it and remount.
my $devboot = 'boot'; activate('boot');
if (get_var('OFW')) {
# for PowerPC vda1 is PreP partition.
$devboot = 'vda2';
}
activate($devboot);
# Boot is the only ext4 partition on that scheme, so we will use that to make a needle. # Boot is the only ext4 partition on that scheme, so we will use that to make a needle.
wait_still_screen 5; wait_still_screen 5;
custom_blivet_format_partition(type => 'ext4', label => 'boot', mountpoint => '/boot'); custom_blivet_format_partition(type => 'ext4', label => 'boot', mountpoint => '/boot');