diff options
Diffstat (limited to 'perl-install/install/steps_interactive.pm')
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 55985e01a..aaacd7fba 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -817,11 +817,11 @@ Do you want to install the updates?")), #------------------------------------------------------------------------------ sub configureTimezone { - my ($o, $clicked) = @_; + my ($o, $post_install) = @_; - any::configure_timezone($o, $o->{timezone}, $clicked) or return; + any::configure_timezone($o, $o->{timezone}, 1) or return; - install::steps::configureTimezone($o); + install::steps::configureTimezone($o) if $post_install; 1; } @@ -837,7 +837,6 @@ sub configureServices { sub summaryBefore { my ($o) = @_; - install::any::preConfigureTimezone($o); #- get back network configuration. require network::network; eval { @@ -886,10 +885,6 @@ sub summary { $o->pkg_install(map { $_->name } @pkgs) if @pkgs; lang::write_and_install($o->{locale}, $o->do_pkgs); - if (!$timezone_manually_set && !$o->{isUpgrade}) { - delete $o->{timezone}; - install::any::preConfigureTimezone($o); #- now we can precise the timezone thanks to the country - } }, }; local $o->{bootloader}{boot} = 'ESP' if is_uefi(); |