testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

g-i-s suppression change now applies to FAW 28+

Browse Source 
Since gnome-initial-setup-3.28.0-5.fc28 , the g-i-s screens
that are supposed to be suppressed as part of
https://fedoraproject.org/wiki/Changes/ReduceInitialSetupRedundancy
are now suppressed on FAW installs as well as traditional ones.
So adjust the logic accordingly.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2018-04-09 16:50:16 -07:00
parent 28080d3187
commit 51b46bab7b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/utils.pm
View File

@ -451,11 +451,9 @@ sub gnome_initial_setup {
# the 'new user' mode by # the 'new user' mode by
# 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 ,
# except this doesn't seem to take effect on FAW: # except 'language' is never *really* skipped (see above)
# https://bugzilla.redhat.com/show_bug.cgi?id=1474787#c16 , @nexts = grep {$_ ne 'keyboard'} @nexts if (($version eq 'rawhide' || $version > 27);
# and 'language' is never *really* skipped (see above) @nexts = grep {$_ ne 'timezone'} @nexts if (($version eq 'rawhide' || $version > 27);
@nexts = grep {$_ ne 'keyboard'} @nexts if (($version eq 'rawhide' || $version > 27) && get_var("SUBVARIANT") ne 'AtomicWorkstation');
@nexts = grep {$_ ne 'timezone'} @nexts if (($version eq 'rawhide' || $version > 27) && get_var("SUBVARIANT") ne 'AtomicWorkstation');
} }
else { else {
# 'timezone' and 'software' are suppressed for the 'existing user' # 'timezone' and 'software' are suppressed for the 'existing user'