srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-09-21 14:37:23 +00:00
Code Issues Releases Activity

g-i-s: go back to relnum conditional, update comments

Browse Source 
Changing to a conditional based on whether we saw webui broke the
ostree installer install tests, because they of course use the
same g-i-s even though they don't use webui. So, we have to go
back to the relnum-based conditional :/

Yes, this means we have redundant screens in g-i-s for install
paths that use gtkui to deploy GNOME, e.g. SB installer images,
but I can't see a good way to fix that. We need to show those
screens for the live install, which is the 'most important'
one, and we don't have an obvious way to show them for installs
that used webui but hide them for installs that used gtkui.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2024-08-20 23:12:29 -07:00
parent eed86f4feb
commit cbb9bb59d4
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/utils.pm
View File

@ -867,23 +867,21 @@ sub gnome_initial_setup {
@nexts = ('language', 'keyboard'); @nexts = ('language', 'keyboard');
} }
if ($args{prelogin}) { if ($args{prelogin}) {
# On releases that use anaconda gtkui, we configure g-i-s to # On releases that use anaconda gtkui on live images, we
# skip 'language', 'keyboard' and 'timezone' using a custom # configure g-i-s to skip 'language', 'keyboard' and 'timezone'
# vendor.conf: # using a custom vendor.conf:
# https://fedoraproject.org//wiki/Changes/ReduceInitialSetupRedundancy # https://fedoraproject.org//wiki/Changes/ReduceInitialSetupRedundancy
# https://bugzilla.redhat.com/show_bug.cgi?id=1474787 , # https://bugzilla.redhat.com/show_bug.cgi?id=1474787 ,
# but 'language' is never *really* skipped (see above) # but 'language' is never *really* skipped (see above)
unless (get_var("_ANACONDA_WEBUI")) { if ($relnum < 42) {
@nexts = grep { $_ ne 'keyboard' } @nexts; @nexts = grep { $_ ne 'keyboard' } @nexts;
@nexts = grep { $_ ne 'timezone' } @nexts; @nexts = grep { $_ ne 'timezone' } @nexts;
} }
# On releases that use anaconda-webui, we use vendor.conf to # if g-i-s ran before anaconda (as expected on the live + webui
# skip 'language' and 'keyboard' (meaning 'language' is turned # flow), anaconda forwards a g-i-s state file to the installed
# into 'welcome' and 'keyboard' is really skipped) on live # system, causing it to skip 'language' and 'keyboard' (meaning
# installs because we saw them already. network installs and # 'language' is turned into 'welcome' and 'keyboard' is really
# disk image deployments will show these screens (which is good # skipped)
# for disk image deployments, but redundant for network
# installs)
if (match_has_tag "start_setup") { if (match_has_tag "start_setup") {
# if we saw start_setup, that means 'language' was skipped # if we saw start_setup, that means 'language' was skipped
# and we can assume 'keyboard' will also be skipped # and we can assume 'keyboard' will also be skipped