contain country, time zone and keymap parsing to env module

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Proxmox/Install/Env.pm b/Proxmox/Install/Env.pm
index 8b6e571a1b19b091fc39dd6d4ca4f95332901a62..09eeb7594c888516c1d591e966c502f691abf88c 100644 (file)
--- a/Proxmox/Install/Env.pm
+++ b/Proxmox/Install/Env.pm
@@ -29,7 +29,7 @@ my $product_cfg = {
     },
 };
 
-my sub read_cmap {
+my sub read_locale_info {
     my ($lib_dir) = @_;
 
     my $countryfn = "${lib_dir}/country.dat";
@@ -134,6 +134,7 @@ sub setup {
        cfg => $cfg,
        iso => $cd_info,
        locations => $locations,
+       locales => read_locale_info($locations->{lib}),
     };
 
     return $env;

diff --git a/proxinstall b/proxinstall
index f5d224d583c69987c85e56ac9e3a1378b8d26a15..5ea3692c30f52f3861991c68c2c1b7fa88ac35b4 100755 (executable)
--- a/proxinstall
+++ b/proxinstall
@@ -155,7 +155,7 @@ my $timezone = 'Europe/Vienna';
 my $keymap = 'en-us';
 my $password;
 my $mailto = 'mail@example.invalid';
-my $cmap;
+my $cmap = $env->{locales};
 my $autoreboot_seconds = 5;
 
 my $config = {
@@ -3042,9 +3042,6 @@ $ipconf = Proxmox::Sys::Net::get_ip_config();
 
 $country = detect_country() if $ipconf->{default} || is_test_mode();
 
-# read country, kmap and timezone infos
-$cmap = Proxmox::Install::Env::read_cmap($env->{locations}->{lib});
-
 if (!defined($cmap->{country}->{$country})) {
     log_warn("ignoring detected country '$country', invalid or unknown\n");
     $country = undef;