srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-21 13:33:08 +00:00
Code Issues Releases Activity

Tweak the select_disks special case for another anaconda change

Browse Source 
anaconda now no longer protects the entire disk which contains
stage 2 or is being used as an install source, it protects only
the relevant partition:
https://github.com/rhinstaller/anaconda/pull/5687
so we want to go down the regular path again with F41+. We can
drop the "before F39" bound now, as F38 is EOL.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2024-07-05 09:48:33 -07:00
parent 88967ff273
commit 8cbf280e93
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/anaconda.pm
View File

@ -34,13 +34,13 @@ sub select_disks {
assert_and_click "anaconda_main_hub_install_destination"; assert_and_click "anaconda_main_hub_install_destination";
# this is awkward, but on the install_repository_hd_variation test, # this is awkward, but on the install_repository_hd_variation test,
# we have two disks but on F39+ anaconda knows we're using one of # we have two disks but in F39 and F40 anaconda knows we're using
# them as an install source and 'protects' it (doesn't show it on # one of them as an install source and 'protects' the entire disk
# INSTALLATION DESTINATION), so we need to go down the single disk # (doesn't show it on INSTALLATION DESTINATION), so we need to go
# branch in that case. Once F38 is EOL we could potentially tweak # down the single disk branch in that case. On F41+ it protects
# this to use a dedicated var or something # only the partition being used as a source
my $relnum = get_release_number; my $relnum = get_release_number;
if (get_var('NUMDISKS') > 1 && !(get_var('TEST') eq 'install_repository_hd_variation' && $relnum > 38)) { if (get_var('NUMDISKS') > 1 && !(get_var('TEST') eq 'install_repository_hd_variation' && $relnum < 41)) {
# Multi-disk case. Select however many disks the test needs. If # Multi-disk case. Select however many disks the test needs. If
# $disks is 0, this will do nothing, and 0 disks will be selected. # $disks is 0, this will do nothing, and 0 disks will be selected.
for my $n (1 .. $args{disks}) { for my $n (1 .. $args{disks}) {