From 51b46bab7bbfbb2dae709ae8b793cb41aadd2288 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 9 Apr 2018 16:50:16 -0700 Subject: [PATCH] g-i-s suppression change now applies to FAW 28+ 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 --- lib/utils.pm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/utils.pm b/lib/utils.pm index 55327d37..2d325e50 100644 --- a/lib/utils.pm +++ b/lib/utils.pm @@ -451,11 +451,9 @@ sub gnome_initial_setup { # the 'new user' mode by # https://fedoraproject.org//wiki/Changes/ReduceInitialSetupRedundancy # https://bugzilla.redhat.com/show_bug.cgi?id=1474787 , - # except this doesn't seem to take effect on FAW: - # https://bugzilla.redhat.com/show_bug.cgi?id=1474787#c16 , - # and 'language' is never *really* skipped (see above) - @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'); + # except 'language' is never *really* skipped (see above) + @nexts = grep {$_ ne 'keyboard'} @nexts if (($version eq 'rawhide' || $version > 27); + @nexts = grep {$_ ne 'timezone'} @nexts if (($version eq 'rawhide' || $version > 27); } else { # 'timezone' and 'software' are suppressed for the 'existing user'