From bf24ef177504839892271171ccef6533bf449263 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Thu, 18 Apr 2019 19:53:15 +0100
Subject: installer: don't automatically change time zone on upgrade
 (mga#24670)

---
 perl-install/install/NEWS                 | 1 +
 perl-install/install/steps_interactive.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 01fe86fa0..121317763 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- don't automatically change time zone on upgrade (mga#24670)
 - partitioning: fix resize of encrypted partitions (mga#22032)
 
 Version 18.12 - 16 March 2019
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 22af7b36d..83f102a10 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -866,7 +866,7 @@ sub summary {
 	    $o->pkg_install(map { $_->name } @pkgs) if @pkgs;
 
 	    lang::write_and_install($o->{locale}, $o->do_pkgs);
-	    if (!$timezone_manually_set) {
+	    if (!$timezone_manually_set && !$o->{isUpgrade}) {
 		delete $o->{timezone};
 		install::any::preConfigureTimezone($o); #- now we can precise the timezone thanks to the country
 	    }
-- 
cgit v1.2.1