public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] [PATCH installer v3 0/3] remove mirror selection from installer
@ 2025-09-22 12:11 Shannon Sterz
  2025-09-22 12:11 ` [pve-devel] [PATCH installer v3 1/3] install: don't select a debian mirror based on the country anymore Shannon Sterz
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Shannon Sterz @ 2025-09-22 12:11 UTC (permalink / raw)
  To: pve-devel

these three patches remove the debian mirror selection from the
installer as it is no longer needed. debian recommends using its CDN
these days [1]. so we don't need to select a mirror.

[1]: https://www.debian.org/releases/trixie/release-notes/upgrading.en.html#adding-apt-internet-sources

Changelog
---------

changes since v2, thanks @ Christoph Heiss:

- remove the mirror entries from
  `proxmox-auto-installer/tests/resources/locales.json`

changes since v1, thanks @ Fiona Ebner:

- add a patch that removes generating the mirror information from
  country.pl
- add a patch rephrasing the installers text to remove mentions of
  selecting a mirror.


Shannon Sterz (3):
  install: don't select a debian mirror based on the country anymore
  country.pl: remove generating mirror information
  html/country: update explanatory text to not mention setting a mirror

 Proxmox/Install.pm                            |   6 -
 country.pl                                    |  12 +-
 html/country.htm                              |   9 +-
 .../tests/resources/locales.json              | 249 ------------------
 4 files changed, 5 insertions(+), 271 deletions(-)

--
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [pve-devel] [PATCH installer v3 1/3] install: don't select a debian mirror based on the country anymore
  2025-09-22 12:11 [pve-devel] [PATCH installer v3 0/3] remove mirror selection from installer Shannon Sterz
@ 2025-09-22 12:11 ` Shannon Sterz
  2025-09-22 12:11 ` [pve-devel] [PATCH installer v3 2/3] country.pl: remove generating mirror information Shannon Sterz
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Shannon Sterz @ 2025-09-22 12:11 UTC (permalink / raw)
  To: pve-devel

newer isos ship with new deb822 style repository configurations in
`/etc/apt/sources.list.d/debian.sources` which already use the now
prefered cdn [1]. since setting a mirror like this does not work
anymore due to this change, just remove it to keep using the prefered
cdn.

[1]:
https://www.debian.org/releases/trixie/release-notes/upgrading.en.html#adding-apt-internet-sources

Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
---
 Proxmox/Install.pm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm
index 2ebd376..b42d2f0 100644
--- a/Proxmox/Install.pm
+++ b/Proxmox/Install.pm
@@ -1315,12 +1315,6 @@ _EOD
 
         my $country = Proxmox::Install::Config::get_country();
 
-        # set apt mirror
-        if (my $mirror = $iso_env->{locales}->{country}->{$country}->{mirror}) {
-            my $fn = "$targetdir/etc/apt/sources.list";
-            syscmd("sed -i 's/ftp\\.debian\\.org/$mirror/' '$fn'");
-        }
-
         # create extended_states for apt (avoid cron job warning if that
         # file does not exist)
         file_write_all("$targetdir/var/lib/apt/extended_states", '');
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [pve-devel] [PATCH installer v3 2/3] country.pl: remove generating mirror information
  2025-09-22 12:11 [pve-devel] [PATCH installer v3 0/3] remove mirror selection from installer Shannon Sterz
  2025-09-22 12:11 ` [pve-devel] [PATCH installer v3 1/3] install: don't select a debian mirror based on the country anymore Shannon Sterz
@ 2025-09-22 12:11 ` Shannon Sterz
  2025-11-04 12:29   ` Christoph Heiss
  2025-09-22 12:11 ` [pve-devel] [PATCH installer v3 3/3] html/country: update explanatory text to not mention setting a mirror Shannon Sterz
  2025-11-04 13:25 ` [pve-devel] [PATCH installer v3 0/3] remove mirror selection from installer Christoph Heiss
  3 siblings, 1 reply; 6+ messages in thread
From: Shannon Sterz @ 2025-09-22 12:11 UTC (permalink / raw)
  To: pve-devel

this is no longer needed, as we don't rely on this information in the
installer anymore.

Suggested-by: Fiona Ebner <f.ebner@proxmox.com>
Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
---
 country.pl                                    |  12 +-
 .../tests/resources/locales.json              | 249 ------------------
 2 files changed, 2 insertions(+), 259 deletions(-)

diff --git a/country.pl b/country.pl
index 227eba4..be760bb 100755
--- a/country.pl
+++ b/country.pl
@@ -8,23 +8,20 @@ use JSON qw(from_json to_json);
 
 # Generates a
 #
-#   - country code => name/kmap/mirror
 #   - name => country code
 #
 # mapping for each defined country
 my sub generate_country_mappings {
-    my ($country_codes, $defmap, $mirrors) = @_;
+    my ($country_codes, $defmap) = @_;
 
     my ($countries, $countryhash) = ({}, {});
     foreach my $cc (sort keys %$country_codes) {
         my $name = $country_codes->{$cc};
         my $kmap = $defmap->{$cc} || '';
-        my $mirror = $mirrors->{$cc} || '';
 
         $countries->{$cc} = {
             name => $name,
             kmap => $kmap,
-            mirror => $mirror,
         };
         $countryhash->{ lc($name) } = $cc;
     }
@@ -124,12 +121,7 @@ my $defmap = {
     'li' => 'de-ch',
 };
 
-my $mirrors = PVE::Tools::debmirrors();
-foreach my $cc (keys %$mirrors) {
-    die "undefined country code '$cc'" if !defined($country_codes->{$cc});
-}
-
-my ($countries, $countryhash) = generate_country_mappings($country_codes, $defmap, $mirrors);
+my ($countries, $countryhash) = generate_country_mappings($country_codes, $defmap);
 my ($kmap, $kmaphash) = generate_keymaps($country_codes);
 my ($zones, $cczones) = parse_zoneinfo($countries);
 
diff --git a/proxmox-auto-installer/tests/resources/locales.json b/proxmox-auto-installer/tests/resources/locales.json
index 77ab58f..69a8573 100644
--- a/proxmox-auto-installer/tests/resources/locales.json
+++ b/proxmox-auto-installer/tests/resources/locales.json
@@ -916,1493 +916,1244 @@
   "country": {
     "ad": {
       "kmap": "",
-      "mirror": "",
       "name": "Andorra",
       "zone": "Europe/Andorra"
     },
     "ae": {
       "kmap": "",
-      "mirror": "",
       "name": "United Arab Emirates",
       "zone": "Asia/Dubai"
     },
     "af": {
       "kmap": "",
-      "mirror": "",
       "name": "Afghanistan",
       "zone": "Asia/Kabul"
     },
     "ag": {
       "kmap": "",
-      "mirror": "",
       "name": "Antigua and Barbuda",
       "zone": "America/Antigua"
     },
     "ai": {
       "kmap": "",
-      "mirror": "",
       "name": "Anguilla",
       "zone": "America/Anguilla"
     },
     "al": {
       "kmap": "",
-      "mirror": "",
       "name": "Albania",
       "zone": "Europe/Tirane"
     },
     "am": {
       "kmap": "",
-      "mirror": "",
       "name": "Armenia",
       "zone": "Asia/Yerevan"
     },
     "ao": {
       "kmap": "",
-      "mirror": "",
       "name": "Angola",
       "zone": "Africa/Luanda"
     },
     "aq": {
       "kmap": "",
-      "mirror": "",
       "name": "Antarctica",
       "zone": "Antarctica/McMurdo"
     },
     "ar": {
       "kmap": "",
-      "mirror": "",
       "name": "Argentina",
       "zone": "America/Argentina/Buenos_Aires"
     },
     "as": {
       "kmap": "",
-      "mirror": "",
       "name": "American Samoa",
       "zone": "Pacific/Pago_Pago"
     },
     "at": {
       "kmap": "de",
-      "mirror": "ftp.at.debian.org",
       "name": "Austria",
       "zone": "Europe/Vienna"
     },
     "au": {
       "kmap": "",
-      "mirror": "ftp.au.debian.org",
       "name": "Australia",
       "zone": "Australia/Lord_Howe"
     },
     "aw": {
       "kmap": "",
-      "mirror": "",
       "name": "Aruba",
       "zone": "America/Aruba"
     },
     "ax": {
       "kmap": "",
-      "mirror": "",
       "name": "Åland Islands",
       "zone": "Europe/Mariehamn"
     },
     "az": {
       "kmap": "",
-      "mirror": "",
       "name": "Azerbaijan",
       "zone": "Asia/Baku"
     },
     "ba": {
       "kmap": "",
-      "mirror": "",
       "name": "Bosnia and Herzegovina",
       "zone": "Europe/Sarajevo"
     },
     "bb": {
       "kmap": "",
-      "mirror": "",
       "name": "Barbados",
       "zone": "America/Barbados"
     },
     "bd": {
       "kmap": "",
-      "mirror": "",
       "name": "Bangladesh",
       "zone": "Asia/Dhaka"
     },
     "be": {
       "kmap": "fr-be",
-      "mirror": "ftp.be.debian.org",
       "name": "Belgium",
       "zone": "Europe/Brussels"
     },
     "bf": {
       "kmap": "",
-      "mirror": "",
       "name": "Burkina Faso",
       "zone": "Africa/Ouagadougou"
     },
     "bg": {
       "kmap": "",
-      "mirror": "ftp.bg.debian.org",
       "name": "Bulgaria",
       "zone": "Europe/Sofia"
     },
     "bh": {
       "kmap": "",
-      "mirror": "",
       "name": "Bahrain",
       "zone": "Asia/Bahrain"
     },
     "bi": {
       "kmap": "",
-      "mirror": "",
       "name": "Burundi",
       "zone": "Africa/Bujumbura"
     },
     "bj": {
       "kmap": "",
-      "mirror": "",
       "name": "Benin",
       "zone": "Africa/Porto-Novo"
     },
     "bl": {
       "kmap": "",
-      "mirror": "",
       "name": "Saint Barthélemy",
       "zone": "America/St_Barthelemy"
     },
     "bm": {
       "kmap": "",
-      "mirror": "",
       "name": "Bermuda",
       "zone": "Atlantic/Bermuda"
     },
     "bn": {
       "kmap": "",
-      "mirror": "",
       "name": "Brunei Darussalam",
       "zone": "Asia/Brunei"
     },
     "bo": {
       "kmap": "",
-      "mirror": "",
       "name": "Bolivia",
       "zone": "America/La_Paz"
     },
     "bq": {
       "kmap": "",
-      "mirror": "",
       "name": "Bonaire, Sint Eustatius and Saba",
       "zone": "America/Kralendijk"
     },
     "br": {
       "kmap": "pt-br",
-      "mirror": "ftp.br.debian.org",
       "name": "Brazil",
       "zone": "America/Noronha"
     },
     "bs": {
       "kmap": "",
-      "mirror": "",
       "name": "Bahamas",
       "zone": "America/Nassau"
     },
     "bt": {
       "kmap": "",
-      "mirror": "",
       "name": "Bhutan",
       "zone": "Asia/Thimphu"
     },
     "bv": {
       "kmap": "",
-      "mirror": "",
       "name": "Bouvet Island"
     },
     "bw": {
       "kmap": "",
-      "mirror": "",
       "name": "Botswana",
       "zone": "Africa/Gaborone"
     },
     "by": {
       "kmap": "",
-      "mirror": "",
       "name": "Belarus",
       "zone": "Europe/Minsk"
     },
     "bz": {
       "kmap": "",
-      "mirror": "",
       "name": "Belize",
       "zone": "America/Belize"
     },
     "ca": {
       "kmap": "en-us",
-      "mirror": "ftp.ca.debian.org",
       "name": "Canada",
       "zone": "America/St_Johns"
     },
     "cc": {
       "kmap": "",
-      "mirror": "",
       "name": "Cocos (Keeling) Islands",
       "zone": "Indian/Cocos"
     },
     "cd": {
       "kmap": "",
-      "mirror": "",
       "name": "Congo, The Democratic Republic of the",
       "zone": "Africa/Kinshasa"
     },
     "cf": {
       "kmap": "",
-      "mirror": "",
       "name": "Central African Republic",
       "zone": "Africa/Bangui"
     },
     "cg": {
       "kmap": "",
-      "mirror": "",
       "name": "Congo",
       "zone": "Africa/Brazzaville"
     },
     "ch": {
       "kmap": "de-ch",
-      "mirror": "ftp.ch.debian.org",
       "name": "Switzerland",
       "zone": "Europe/Zurich"
     },
     "ci": {
       "kmap": "",
-      "mirror": "",
       "name": "Côte d'Ivoire",
       "zone": "Africa/Abidjan"
     },
     "ck": {
       "kmap": "",
-      "mirror": "",
       "name": "Cook Islands",
       "zone": "Pacific/Rarotonga"
     },
     "cl": {
       "kmap": "",
-      "mirror": "ftp.cl.debian.org",
       "name": "Chile",
       "zone": "America/Santiago"
     },
     "cm": {
       "kmap": "",
-      "mirror": "",
       "name": "Cameroon",
       "zone": "Africa/Douala"
     },
     "cn": {
       "kmap": "",
-      "mirror": "",
       "name": "China",
       "zone": "Asia/Shanghai"
     },
     "co": {
       "kmap": "",
-      "mirror": "",
       "name": "Colombia",
       "zone": "America/Bogota"
     },
     "cr": {
       "kmap": "",
-      "mirror": "",
       "name": "Costa Rica",
       "zone": "America/Costa_Rica"
     },
     "cu": {
       "kmap": "",
-      "mirror": "",
       "name": "Cuba",
       "zone": "America/Havana"
     },
     "cv": {
       "kmap": "",
-      "mirror": "",
       "name": "Cabo Verde",
       "zone": "Atlantic/Cape_Verde"
     },
     "cw": {
       "kmap": "",
-      "mirror": "",
       "name": "Curaçao",
       "zone": "America/Curacao"
     },
     "cx": {
       "kmap": "",
-      "mirror": "",
       "name": "Christmas Island",
       "zone": "Indian/Christmas"
     },
     "cy": {
       "kmap": "",
-      "mirror": "",
       "name": "Cyprus",
       "zone": "Asia/Nicosia"
     },
     "cz": {
       "kmap": "",
-      "mirror": "ftp.cz.debian.org",
       "name": "Czechia",
       "zone": "Europe/Prague"
     },
     "de": {
       "kmap": "de",
-      "mirror": "ftp.de.debian.org",
       "name": "Germany",
       "zone": "Europe/Berlin"
     },
     "dj": {
       "kmap": "",
-      "mirror": "",
       "name": "Djibouti",
       "zone": "Africa/Djibouti"
     },
     "dk": {
       "kmap": "dk",
-      "mirror": "ftp.dk.debian.org",
       "name": "Denmark",
       "zone": "Europe/Copenhagen"
     },
     "dm": {
       "kmap": "",
-      "mirror": "",
       "name": "Dominica",
       "zone": "America/Dominica"
     },
     "do": {
       "kmap": "",
-      "mirror": "",
       "name": "Dominican Republic",
       "zone": "America/Santo_Domingo"
     },
     "dz": {
       "kmap": "",
-      "mirror": "",
       "name": "Algeria",
       "zone": "Africa/Algiers"
     },
     "ec": {
       "kmap": "",
-      "mirror": "",
       "name": "Ecuador",
       "zone": "America/Guayaquil"
     },
     "ee": {
       "kmap": "",
-      "mirror": "ftp.ee.debian.org",
       "name": "Estonia",
       "zone": "Europe/Tallinn"
     },
     "eg": {
       "kmap": "",
-      "mirror": "",
       "name": "Egypt",
       "zone": "Africa/Cairo"
     },
     "eh": {
       "kmap": "",
-      "mirror": "",
       "name": "Western Sahara",
       "zone": "Africa/El_Aaiun"
     },
     "er": {
       "kmap": "",
-      "mirror": "",
       "name": "Eritrea",
       "zone": "Africa/Asmara"
     },
     "es": {
       "kmap": "es",
-      "mirror": "ftp.es.debian.org",
       "name": "Spain",
       "zone": "Europe/Madrid"
     },
     "et": {
       "kmap": "",
-      "mirror": "",
       "name": "Ethiopia",
       "zone": "Africa/Addis_Ababa"
     },
     "fi": {
       "kmap": "fi",
-      "mirror": "ftp.fi.debian.org",
       "name": "Finland",
       "zone": "Europe/Helsinki"
     },
     "fj": {
       "kmap": "",
-      "mirror": "",
       "name": "Fiji",
       "zone": "Pacific/Fiji"
     },
     "fk": {
       "kmap": "",
-      "mirror": "",
       "name": "Falkland Islands (Malvinas)",
       "zone": "Atlantic/Stanley"
     },
     "fm": {
       "kmap": "",
-      "mirror": "",
       "name": "Micronesia, Federated States of",
       "zone": "Pacific/Chuuk"
     },
     "fo": {
       "kmap": "",
-      "mirror": "",
       "name": "Faroe Islands",
       "zone": "Atlantic/Faroe"
     },
     "fr": {
       "kmap": "fr",
-      "mirror": "ftp.fr.debian.org",
       "name": "France",
       "zone": "Europe/Paris"
     },
     "ga": {
       "kmap": "",
-      "mirror": "",
       "name": "Gabon",
       "zone": "Africa/Libreville"
     },
     "gb": {
       "kmap": "en-gb",
-      "mirror": "ftp.uk.debian.org",
       "name": "United Kingdom",
       "zone": "Europe/London"
     },
     "gd": {
       "kmap": "",
-      "mirror": "",
       "name": "Grenada",
       "zone": "America/Grenada"
     },
     "ge": {
       "kmap": "",
-      "mirror": "",
       "name": "Georgia",
       "zone": "Asia/Tbilisi"
     },
     "gf": {
       "kmap": "",
-      "mirror": "",
       "name": "French Guiana",
       "zone": "America/Cayenne"
     },
     "gg": {
       "kmap": "",
-      "mirror": "",
       "name": "Guernsey",
       "zone": "Europe/Guernsey"
     },
     "gh": {
       "kmap": "",
-      "mirror": "",
       "name": "Ghana",
       "zone": "Africa/Accra"
     },
     "gi": {
       "kmap": "es",
-      "mirror": "",
       "name": "Gibraltar",
       "zone": "Europe/Gibraltar"
     },
     "gl": {
       "kmap": "",
-      "mirror": "",
       "name": "Greenland",
       "zone": "America/Nuuk"
     },
     "gm": {
       "kmap": "",
-      "mirror": "",
       "name": "Gambia",
       "zone": "Africa/Banjul"
     },
     "gn": {
       "kmap": "",
-      "mirror": "",
       "name": "Guinea",
       "zone": "Africa/Conakry"
     },
     "gp": {
       "kmap": "",
-      "mirror": "",
       "name": "Guadeloupe",
       "zone": "America/Guadeloupe"
     },
     "gq": {
       "kmap": "",
-      "mirror": "",
       "name": "Equatorial Guinea",
       "zone": "Africa/Malabo"
     },
     "gr": {
       "kmap": "",
-      "mirror": "ftp.gr.debian.org",
       "name": "Greece",
       "zone": "Europe/Athens"
     },
     "gs": {
       "kmap": "",
-      "mirror": "",
       "name": "South Georgia and the South Sandwich Islands",
       "zone": "Atlantic/South_Georgia"
     },
     "gt": {
       "kmap": "",
-      "mirror": "",
       "name": "Guatemala",
       "zone": "America/Guatemala"
     },
     "gu": {
       "kmap": "",
-      "mirror": "",
       "name": "Guam",
       "zone": "Pacific/Guam"
     },
     "gw": {
       "kmap": "",
-      "mirror": "",
       "name": "Guinea-Bissau",
       "zone": "Africa/Bissau"
     },
     "gy": {
       "kmap": "",
-      "mirror": "",
       "name": "Guyana",
       "zone": "America/Guyana"
     },
     "hk": {
       "kmap": "",
-      "mirror": "ftp.hk.debian.org",
       "name": "Hong Kong",
       "zone": "Asia/Hong_Kong"
     },
     "hm": {
       "kmap": "",
-      "mirror": "",
       "name": "Heard Island and McDonald Islands"
     },
     "hn": {
       "kmap": "",
-      "mirror": "",
       "name": "Honduras",
       "zone": "America/Tegucigalpa"
     },
     "hr": {
       "kmap": "",
-      "mirror": "ftp.hr.debian.org",
       "name": "Croatia",
       "zone": "Europe/Zagreb"
     },
     "ht": {
       "kmap": "",
-      "mirror": "",
       "name": "Haiti",
       "zone": "America/Port-au-Prince"
     },
     "hu": {
       "kmap": "hu",
-      "mirror": "ftp.hu.debian.org",
       "name": "Hungary",
       "zone": "Europe/Budapest"
     },
     "id": {
       "kmap": "",
-      "mirror": "",
       "name": "Indonesia",
       "zone": "Asia/Jakarta"
     },
     "ie": {
       "kmap": "",
-      "mirror": "ftp.ie.debian.org",
       "name": "Ireland",
       "zone": "Europe/Dublin"
     },
     "il": {
       "kmap": "",
-      "mirror": "",
       "name": "Israel",
       "zone": "Asia/Jerusalem"
     },
     "im": {
       "kmap": "",
-      "mirror": "",
       "name": "Isle of Man",
       "zone": "Europe/Isle_of_Man"
     },
     "in": {
       "kmap": "",
-      "mirror": "",
       "name": "India",
       "zone": "Asia/Kolkata"
     },
     "io": {
       "kmap": "",
-      "mirror": "",
       "name": "British Indian Ocean Territory",
       "zone": "Indian/Chagos"
     },
     "iq": {
       "kmap": "",
-      "mirror": "",
       "name": "Iraq",
       "zone": "Asia/Baghdad"
     },
     "ir": {
       "kmap": "",
-      "mirror": "",
       "name": "Iran",
       "zone": "Asia/Tehran"
     },
     "is": {
       "kmap": "is",
-      "mirror": "ftp.is.debian.org",
       "name": "Iceland",
       "zone": "Atlantic/Reykjavik"
     },
     "it": {
       "kmap": "it",
-      "mirror": "ftp.it.debian.org",
       "name": "Italy",
       "zone": "Europe/Rome"
     },
     "je": {
       "kmap": "",
-      "mirror": "",
       "name": "Jersey",
       "zone": "Europe/Jersey"
     },
     "jm": {
       "kmap": "",
-      "mirror": "",
       "name": "Jamaica",
       "zone": "America/Jamaica"
     },
     "jo": {
       "kmap": "",
-      "mirror": "",
       "name": "Jordan",
       "zone": "Asia/Amman"
     },
     "jp": {
       "kmap": "jp",
-      "mirror": "ftp.jp.debian.org",
       "name": "Japan",
       "zone": "Asia/Tokyo"
     },
     "ke": {
       "kmap": "",
-      "mirror": "",
       "name": "Kenya",
       "zone": "Africa/Nairobi"
     },
     "kg": {
       "kmap": "",
-      "mirror": "",
       "name": "Kyrgyzstan",
       "zone": "Asia/Bishkek"
     },
     "kh": {
       "kmap": "",
-      "mirror": "",
       "name": "Cambodia",
       "zone": "Asia/Phnom_Penh"
     },
     "ki": {
       "kmap": "",
-      "mirror": "",
       "name": "Kiribati",
       "zone": "Pacific/Tarawa"
     },
     "km": {
       "kmap": "",
-      "mirror": "",
       "name": "Comoros",
       "zone": "Indian/Comoro"
     },
     "kn": {
       "kmap": "",
-      "mirror": "",
       "name": "Saint Kitts and Nevis",
       "zone": "America/St_Kitts"
     },
     "kp": {
       "kmap": "",
-      "mirror": "",
       "name": "North Korea",
       "zone": "Asia/Pyongyang"
     },
     "kr": {
       "kmap": "",
-      "mirror": "ftp.kr.debian.org",
       "name": "South Korea",
       "zone": "Asia/Seoul"
     },
     "kw": {
       "kmap": "",
-      "mirror": "",
       "name": "Kuwait",
       "zone": "Asia/Kuwait"
     },
     "ky": {
       "kmap": "",
-      "mirror": "",
       "name": "Cayman Islands",
       "zone": "America/Cayman"
     },
     "kz": {
       "kmap": "",
-      "mirror": "",
       "name": "Kazakhstan",
       "zone": "Asia/Almaty"
     },
     "la": {
       "kmap": "",
-      "mirror": "",
       "name": "Laos",
       "zone": "Asia/Vientiane"
     },
     "lb": {
       "kmap": "",
-      "mirror": "",
       "name": "Lebanon",
       "zone": "Asia/Beirut"
     },
     "lc": {
       "kmap": "",
-      "mirror": "",
       "name": "Saint Lucia",
       "zone": "America/St_Lucia"
     },
     "li": {
       "kmap": "de-ch",
-      "mirror": "",
       "name": "Liechtenstein",
       "zone": "Europe/Vaduz"
     },
     "lk": {
       "kmap": "",
-      "mirror": "",
       "name": "Sri Lanka",
       "zone": "Asia/Colombo"
     },
     "lr": {
       "kmap": "",
-      "mirror": "",
       "name": "Liberia",
       "zone": "Africa/Monrovia"
     },
     "ls": {
       "kmap": "",
-      "mirror": "",
       "name": "Lesotho",
       "zone": "Africa/Maseru"
     },
     "lt": {
       "kmap": "lt",
-      "mirror": "",
       "name": "Lithuania",
       "zone": "Europe/Vilnius"
     },
     "lu": {
       "kmap": "fr-ch",
-      "mirror": "",
       "name": "Luxembourg",
       "zone": "Europe/Luxembourg"
     },
     "lv": {
       "kmap": "",
-      "mirror": "",
       "name": "Latvia",
       "zone": "Europe/Riga"
     },
     "ly": {
       "kmap": "",
-      "mirror": "",
       "name": "Libya",
       "zone": "Africa/Tripoli"
     },
     "ma": {
       "kmap": "",
-      "mirror": "",
       "name": "Morocco",
       "zone": "Africa/Casablanca"
     },
     "mc": {
       "kmap": "",
-      "mirror": "",
       "name": "Monaco",
       "zone": "Europe/Monaco"
     },
     "md": {
       "kmap": "",
-      "mirror": "",
       "name": "Moldova",
       "zone": "Europe/Chisinau"
     },
     "me": {
       "kmap": "",
-      "mirror": "",
       "name": "Montenegro",
       "zone": "Europe/Podgorica"
     },
     "mf": {
       "kmap": "",
-      "mirror": "",
       "name": "Saint Martin (French part)",
       "zone": "America/Marigot"
     },
     "mg": {
       "kmap": "",
-      "mirror": "",
       "name": "Madagascar",
       "zone": "Indian/Antananarivo"
     },
     "mh": {
       "kmap": "",
-      "mirror": "",
       "name": "Marshall Islands",
       "zone": "Pacific/Majuro"
     },
     "mk": {
       "kmap": "mk",
-      "mirror": "",
       "name": "North Macedonia",
       "zone": "Europe/Skopje"
     },
     "ml": {
       "kmap": "",
-      "mirror": "",
       "name": "Mali",
       "zone": "Africa/Bamako"
     },
     "mm": {
       "kmap": "",
-      "mirror": "",
       "name": "Myanmar",
       "zone": "Asia/Yangon"
     },
     "mn": {
       "kmap": "",
-      "mirror": "",
       "name": "Mongolia",
       "zone": "Asia/Ulaanbaatar"
     },
     "mo": {
       "kmap": "",
-      "mirror": "",
       "name": "Macao",
       "zone": "Asia/Macau"
     },
     "mp": {
       "kmap": "",
-      "mirror": "",
       "name": "Northern Mariana Islands",
       "zone": "Pacific/Saipan"
     },
     "mq": {
       "kmap": "",
-      "mirror": "",
       "name": "Martinique",
       "zone": "America/Martinique"
     },
     "mr": {
       "kmap": "",
-      "mirror": "",
       "name": "Mauritania",
       "zone": "Africa/Nouakchott"
     },
     "ms": {
       "kmap": "",
-      "mirror": "",
       "name": "Montserrat",
       "zone": "America/Montserrat"
     },
     "mt": {
       "kmap": "",
-      "mirror": "",
       "name": "Malta",
       "zone": "Europe/Malta"
     },
     "mu": {
       "kmap": "",
-      "mirror": "",
       "name": "Mauritius",
       "zone": "Indian/Mauritius"
     },
     "mv": {
       "kmap": "",
-      "mirror": "",
       "name": "Maldives",
       "zone": "Indian/Maldives"
     },
     "mw": {
       "kmap": "",
-      "mirror": "",
       "name": "Malawi",
       "zone": "Africa/Blantyre"
     },
     "mx": {
       "kmap": "",
-      "mirror": "ftp.mx.debian.org",
       "name": "Mexico",
       "zone": "America/Mexico_City"
     },
     "my": {
       "kmap": "",
-      "mirror": "",
       "name": "Malaysia",
       "zone": "Asia/Kuala_Lumpur"
     },
     "mz": {
       "kmap": "",
-      "mirror": "",
       "name": "Mozambique",
       "zone": "Africa/Maputo"
     },
     "na": {
       "kmap": "",
-      "mirror": "",
       "name": "Namibia",
       "zone": "Africa/Windhoek"
     },
     "nc": {
       "kmap": "",
-      "mirror": "",
       "name": "New Caledonia",
       "zone": "Pacific/Noumea"
     },
     "ne": {
       "kmap": "",
-      "mirror": "",
       "name": "Niger",
       "zone": "Africa/Niamey"
     },
     "nf": {
       "kmap": "",
-      "mirror": "",
       "name": "Norfolk Island",
       "zone": "Pacific/Norfolk"
     },
     "ng": {
       "kmap": "",
-      "mirror": "",
       "name": "Nigeria",
       "zone": "Africa/Lagos"
     },
     "ni": {
       "kmap": "",
-      "mirror": "",
       "name": "Nicaragua",
       "zone": "America/Managua"
     },
     "nl": {
       "kmap": "en-us",
-      "mirror": "ftp.nl.debian.org",
       "name": "Netherlands",
       "zone": "Europe/Amsterdam"
     },
     "no": {
       "kmap": "no",
-      "mirror": "ftp.no.debian.org",
       "name": "Norway",
       "zone": "Europe/Oslo"
     },
     "np": {
       "kmap": "",
-      "mirror": "",
       "name": "Nepal",
       "zone": "Asia/Kathmandu"
     },
     "nr": {
       "kmap": "",
-      "mirror": "",
       "name": "Nauru",
       "zone": "Pacific/Nauru"
     },
     "nu": {
       "kmap": "",
-      "mirror": "",
       "name": "Niue",
       "zone": "Pacific/Niue"
     },
     "nz": {
       "kmap": "",
-      "mirror": "ftp.nz.debian.org",
       "name": "New Zealand",
       "zone": "Pacific/Auckland"
     },
     "om": {
       "kmap": "",
-      "mirror": "",
       "name": "Oman",
       "zone": "Asia/Muscat"
     },
     "pa": {
       "kmap": "",
-      "mirror": "",
       "name": "Panama",
       "zone": "America/Panama"
     },
     "pe": {
       "kmap": "",
-      "mirror": "",
       "name": "Peru",
       "zone": "America/Lima"
     },
     "pf": {
       "kmap": "",
-      "mirror": "",
       "name": "French Polynesia",
       "zone": "Pacific/Tahiti"
     },
     "pg": {
       "kmap": "",
-      "mirror": "",
       "name": "Papua New Guinea",
       "zone": "Pacific/Port_Moresby"
     },
     "ph": {
       "kmap": "",
-      "mirror": "",
       "name": "Philippines",
       "zone": "Asia/Manila"
     },
     "pk": {
       "kmap": "",
-      "mirror": "",
       "name": "Pakistan",
       "zone": "Asia/Karachi"
     },
     "pl": {
       "kmap": "pl",
-      "mirror": "ftp.pl.debian.org",
       "name": "Poland",
       "zone": "Europe/Warsaw"
     },
     "pm": {
       "kmap": "",
-      "mirror": "",
       "name": "Saint Pierre and Miquelon",
       "zone": "America/Miquelon"
     },
     "pn": {
       "kmap": "",
-      "mirror": "",
       "name": "Pitcairn",
       "zone": "Pacific/Pitcairn"
     },
     "pr": {
       "kmap": "",
-      "mirror": "",
       "name": "Puerto Rico",
       "zone": "America/Puerto_Rico"
     },
     "ps": {
       "kmap": "",
-      "mirror": "",
       "name": "Palestine, State of",
       "zone": "Asia/Gaza"
     },
     "pt": {
       "kmap": "pt",
-      "mirror": "ftp.pt.debian.org",
       "name": "Portugal",
       "zone": "Europe/Lisbon"
     },
     "pw": {
       "kmap": "",
-      "mirror": "",
       "name": "Palau",
       "zone": "Pacific/Palau"
     },
     "py": {
       "kmap": "",
-      "mirror": "",
       "name": "Paraguay",
       "zone": "America/Asuncion"
     },
     "qa": {
       "kmap": "",
-      "mirror": "",
       "name": "Qatar",
       "zone": "Asia/Qatar"
     },
     "re": {
       "kmap": "",
-      "mirror": "",
       "name": "Réunion",
       "zone": "Indian/Reunion"
     },
     "ro": {
       "kmap": "",
-      "mirror": "ftp.ro.debian.org",
       "name": "Romania",
       "zone": "Europe/Bucharest"
     },
     "rs": {
       "kmap": "",
-      "mirror": "",
       "name": "Serbia",
       "zone": "Europe/Belgrade"
     },
     "ru": {
       "kmap": "",
-      "mirror": "ftp.ru.debian.org",
       "name": "Russian Federation",
       "zone": "Europe/Kaliningrad"
     },
     "rw": {
       "kmap": "",
-      "mirror": "",
       "name": "Rwanda",
       "zone": "Africa/Kigali"
     },
     "sa": {
       "kmap": "",
-      "mirror": "",
       "name": "Saudi Arabia",
       "zone": "Asia/Riyadh"
     },
     "sb": {
       "kmap": "",
-      "mirror": "",
       "name": "Solomon Islands",
       "zone": "Pacific/Guadalcanal"
     },
     "sc": {
       "kmap": "",
-      "mirror": "",
       "name": "Seychelles",
       "zone": "Indian/Mahe"
     },
     "sd": {
       "kmap": "",
-      "mirror": "",
       "name": "Sudan",
       "zone": "Africa/Khartoum"
     },
     "se": {
       "kmap": "",
-      "mirror": "ftp.se.debian.org",
       "name": "Sweden",
       "zone": "Europe/Stockholm"
     },
     "sg": {
       "kmap": "",
-      "mirror": "",
       "name": "Singapore",
       "zone": "Asia/Singapore"
     },
     "sh": {
       "kmap": "",
-      "mirror": "",
       "name": "Saint Helena, Ascension and Tristan da Cunha",
       "zone": "Atlantic/St_Helena"
     },
     "si": {
       "kmap": "si",
-      "mirror": "ftp.si.debian.org",
       "name": "Slovenia",
       "zone": "Europe/Ljubljana"
     },
     "sj": {
       "kmap": "",
-      "mirror": "",
       "name": "Svalbard and Jan Mayen",
       "zone": "Arctic/Longyearbyen"
     },
     "sk": {
       "kmap": "",
-      "mirror": "ftp.sk.debian.org",
       "name": "Slovakia",
       "zone": "Europe/Bratislava"
     },
     "sl": {
       "kmap": "",
-      "mirror": "",
       "name": "Sierra Leone",
       "zone": "Africa/Freetown"
     },
     "sm": {
       "kmap": "",
-      "mirror": "",
       "name": "San Marino",
       "zone": "Europe/San_Marino"
     },
     "sn": {
       "kmap": "",
-      "mirror": "",
       "name": "Senegal",
       "zone": "Africa/Dakar"
     },
     "so": {
       "kmap": "",
-      "mirror": "",
       "name": "Somalia",
       "zone": "Africa/Mogadishu"
     },
     "sr": {
       "kmap": "",
-      "mirror": "",
       "name": "Suriname",
       "zone": "America/Paramaribo"
     },
     "ss": {
       "kmap": "",
-      "mirror": "",
       "name": "South Sudan",
       "zone": "Africa/Juba"
     },
     "st": {
       "kmap": "",
-      "mirror": "",
       "name": "Sao Tome and Principe",
       "zone": "Africa/Sao_Tome"
     },
     "sv": {
       "kmap": "",
-      "mirror": "",
       "name": "El Salvador",
       "zone": "America/El_Salvador"
     },
     "sx": {
       "kmap": "",
-      "mirror": "",
       "name": "Sint Maarten (Dutch part)",
       "zone": "America/Lower_Princes"
     },
     "sy": {
       "kmap": "",
-      "mirror": "",
       "name": "Syria",
       "zone": "Asia/Damascus"
     },
     "sz": {
       "kmap": "",
-      "mirror": "",
       "name": "Eswatini",
       "zone": "Africa/Mbabane"
     },
     "tc": {
       "kmap": "",
-      "mirror": "",
       "name": "Turks and Caicos Islands",
       "zone": "America/Grand_Turk"
     },
     "td": {
       "kmap": "",
-      "mirror": "",
       "name": "Chad",
       "zone": "Africa/Ndjamena"
     },
     "tf": {
       "kmap": "",
-      "mirror": "",
       "name": "French Southern Territories",
       "zone": "Indian/Kerguelen"
     },
     "tg": {
       "kmap": "",
-      "mirror": "",
       "name": "Togo",
       "zone": "Africa/Lome"
     },
     "th": {
       "kmap": "",
-      "mirror": "",
       "name": "Thailand",
       "zone": "Asia/Bangkok"
     },
     "tj": {
       "kmap": "",
-      "mirror": "",
       "name": "Tajikistan",
       "zone": "Asia/Dushanbe"
     },
     "tk": {
       "kmap": "",
-      "mirror": "",
       "name": "Tokelau",
       "zone": "Pacific/Fakaofo"
     },
     "tl": {
       "kmap": "",
-      "mirror": "",
       "name": "Timor-Leste",
       "zone": "Asia/Dili"
     },
     "tm": {
       "kmap": "",
-      "mirror": "",
       "name": "Turkmenistan",
       "zone": "Asia/Ashgabat"
     },
     "tn": {
       "kmap": "",
-      "mirror": "",
       "name": "Tunisia",
       "zone": "Africa/Tunis"
     },
     "to": {
       "kmap": "",
-      "mirror": "",
       "name": "Tonga",
       "zone": "Pacific/Tongatapu"
     },
     "tr": {
       "kmap": "",
-      "mirror": "ftp.tr.debian.org",
       "name": "Türkiye",
       "zone": "Europe/Istanbul"
     },
     "tt": {
       "kmap": "",
-      "mirror": "",
       "name": "Trinidad and Tobago",
       "zone": "America/Port_of_Spain"
     },
     "tv": {
       "kmap": "",
-      "mirror": "",
       "name": "Tuvalu",
       "zone": "Pacific/Funafuti"
     },
     "tw": {
       "kmap": "",
-      "mirror": "ftp.tw.debian.org",
       "name": "Taiwan",
       "zone": "Asia/Taipei"
     },
     "tz": {
       "kmap": "",
-      "mirror": "",
       "name": "Tanzania",
       "zone": "Africa/Dar_es_Salaam"
     },
     "ua": {
       "kmap": "",
-      "mirror": "",
       "name": "Ukraine",
       "zone": "Europe/Simferopol"
     },
     "ug": {
       "kmap": "",
-      "mirror": "",
       "name": "Uganda",
       "zone": "Africa/Kampala"
     },
     "um": {
       "kmap": "",
-      "mirror": "",
       "name": "United States Minor Outlying Islands",
       "zone": "Pacific/Midway"
     },
     "us": {
       "kmap": "en-us",
-      "mirror": "ftp.us.debian.org",
       "name": "United States",
       "zone": "America/New_York"
     },
     "uy": {
       "kmap": "",
-      "mirror": "",
       "name": "Uruguay",
       "zone": "America/Montevideo"
     },
     "uz": {
       "kmap": "",
-      "mirror": "",
       "name": "Uzbekistan",
       "zone": "Asia/Samarkand"
     },
     "va": {
       "kmap": "it",
-      "mirror": "",
       "name": "Holy See (Vatican City State)",
       "zone": "Europe/Vatican"
     },
     "vc": {
       "kmap": "",
-      "mirror": "",
       "name": "Saint Vincent and the Grenadines",
       "zone": "America/St_Vincent"
     },
     "ve": {
       "kmap": "",
-      "mirror": "",
       "name": "Venezuela",
       "zone": "America/Caracas"
     },
     "vg": {
       "kmap": "",
-      "mirror": "",
       "name": "Virgin Islands, British",
       "zone": "America/Tortola"
     },
     "vi": {
       "kmap": "",
-      "mirror": "",
       "name": "Virgin Islands, U.S.",
       "zone": "America/St_Thomas"
     },
     "vn": {
       "kmap": "",
-      "mirror": "",
       "name": "Vietnam",
       "zone": "Asia/Ho_Chi_Minh"
     },
     "vu": {
       "kmap": "",
-      "mirror": "",
       "name": "Vanuatu",
       "zone": "Pacific/Efate"
     },
     "wf": {
       "kmap": "",
-      "mirror": "",
       "name": "Wallis and Futuna",
       "zone": "Pacific/Wallis"
     },
     "ws": {
       "kmap": "",
-      "mirror": "",
       "name": "Samoa",
       "zone": "Pacific/Apia"
     },
     "ye": {
       "kmap": "",
-      "mirror": "",
       "name": "Yemen",
       "zone": "Asia/Aden"
     },
     "yt": {
       "kmap": "",
-      "mirror": "",
       "name": "Mayotte",
       "zone": "Indian/Mayotte"
     },
     "za": {
       "kmap": "",
-      "mirror": "",
       "name": "South Africa",
       "zone": "Africa/Johannesburg"
     },
     "zm": {
       "kmap": "",
-      "mirror": "",
       "name": "Zambia",
       "zone": "Africa/Lusaka"
     },
     "zw": {
       "kmap": "",
-      "mirror": "",
       "name": "Zimbabwe",
       "zone": "Africa/Harare"
     }
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [pve-devel] [PATCH installer v3 3/3] html/country: update explanatory text to not mention setting a mirror
  2025-09-22 12:11 [pve-devel] [PATCH installer v3 0/3] remove mirror selection from installer Shannon Sterz
  2025-09-22 12:11 ` [pve-devel] [PATCH installer v3 1/3] install: don't select a debian mirror based on the country anymore Shannon Sterz
  2025-09-22 12:11 ` [pve-devel] [PATCH installer v3 2/3] country.pl: remove generating mirror information Shannon Sterz
@ 2025-09-22 12:11 ` Shannon Sterz
  2025-11-04 13:25 ` [pve-devel] [PATCH installer v3 0/3] remove mirror selection from installer Christoph Heiss
  3 siblings, 0 replies; 6+ messages in thread
From: Shannon Sterz @ 2025-09-22 12:11 UTC (permalink / raw)
  To: pve-devel

as we don't set one anymore, but instead just use debian's CDN.

Suggested-by: Fiona Ebner <f.ebner@proxmox.com>
Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
---
 html/country.htm | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/html/country.htm b/html/country.htm
index 990a39f..1271226 100644
--- a/html/country.htm
+++ b/html/country.htm
@@ -16,9 +16,8 @@
     <td colspan="2" valign="top" width="400"><br><p>
     <table>
       <tr><td><b>The Proxmox Installer</b>
-	automatically makes location-based optimizations, like
-	choosing the nearest mirror to download files from. Also make sure
-	to select the correct time zone and keyboard layout.
+	will set up your time zone and keyboard layout. Ensuring that your
+	system behaves as intended once it is up and running.
 	<br><br>
 	Press the Next button to continue the installation.
       </td></tr>
@@ -29,9 +28,7 @@
       <tr>
 	<td valign="top" width="30"><img src="plus.png"></td>
 	<td valign="top"><b>Country:</b>
-	  The selected country is used to choose nearby mirror
-	  servers. This will speed up downloads and make updates more
-	  reliable.
+	  Narrows down the available time zones to make selection easier.
 	  <br><br>
 	</td>
       </tr>
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [pve-devel] [PATCH installer v3 2/3] country.pl: remove generating mirror information
  2025-09-22 12:11 ` [pve-devel] [PATCH installer v3 2/3] country.pl: remove generating mirror information Shannon Sterz
@ 2025-11-04 12:29   ` Christoph Heiss
  0 siblings, 0 replies; 6+ messages in thread
From: Christoph Heiss @ 2025-11-04 12:29 UTC (permalink / raw)
  To: Shannon Sterz; +Cc: Proxmox VE development discussion

Needs a rebase due to commit 879e62238
("country.pl: inline debmirrors definition") [0].

I.e. the entire mirror list definition can now be dropped.

[0] https://git.proxmox.com/?p=pve-installer.git;a=commitdiff;hp=879e62238

On Mon Sep 22, 2025 at 2:11 PM CEST, Shannon Sterz wrote:
> this is no longer needed, as we don't rely on this information in the
> installer anymore.
>
> Suggested-by: Fiona Ebner <f.ebner@proxmox.com>
> Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
> ---
>  country.pl                                    |  12 +-
>  .../tests/resources/locales.json              | 249 ------------------
>  2 files changed, 2 insertions(+), 259 deletions(-)
>
> diff --git a/country.pl b/country.pl
> index 227eba4..be760bb 100755
> --- a/country.pl
> +++ b/country.pl
> @@ -8,23 +8,20 @@ use JSON qw(from_json to_json);
>
>  # Generates a
>  #
> -#   - country code => name/kmap/mirror
>  #   - name => country code
>  #
>  # mapping for each defined country
>  my sub generate_country_mappings {
> -    my ($country_codes, $defmap, $mirrors) = @_;
> +    my ($country_codes, $defmap) = @_;
>
>      my ($countries, $countryhash) = ({}, {});
>      foreach my $cc (sort keys %$country_codes) {
>          my $name = $country_codes->{$cc};
>          my $kmap = $defmap->{$cc} || '';
> -        my $mirror = $mirrors->{$cc} || '';
>
>          $countries->{$cc} = {
>              name => $name,
>              kmap => $kmap,
> -            mirror => $mirror,
>          };
>          $countryhash->{ lc($name) } = $cc;
>      }
> @@ -124,12 +121,7 @@ my $defmap = {
>      'li' => 'de-ch',
>  };
>
> -my $mirrors = PVE::Tools::debmirrors();
> -foreach my $cc (keys %$mirrors) {
> -    die "undefined country code '$cc'" if !defined($country_codes->{$cc});
> -}
> -
> -my ($countries, $countryhash) = generate_country_mappings($country_codes, $defmap, $mirrors);
> +my ($countries, $countryhash) = generate_country_mappings($country_codes, $defmap);
>  my ($kmap, $kmaphash) = generate_keymaps($country_codes);
>  my ($zones, $cczones) = parse_zoneinfo($countries);
>
> diff --git a/proxmox-auto-installer/tests/resources/locales.json b/proxmox-auto-installer/tests/resources/locales.json
> index 77ab58f..69a8573 100644
> --- a/proxmox-auto-installer/tests/resources/locales.json
> +++ b/proxmox-auto-installer/tests/resources/locales.json
> @@ -916,1493 +916,1244 @@
>    "country": {
>      "ad": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Andorra",
>        "zone": "Europe/Andorra"
>      },
>      "ae": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "United Arab Emirates",
>        "zone": "Asia/Dubai"
>      },
>      "af": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Afghanistan",
>        "zone": "Asia/Kabul"
>      },
>      "ag": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Antigua and Barbuda",
>        "zone": "America/Antigua"
>      },
>      "ai": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Anguilla",
>        "zone": "America/Anguilla"
>      },
>      "al": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Albania",
>        "zone": "Europe/Tirane"
>      },
>      "am": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Armenia",
>        "zone": "Asia/Yerevan"
>      },
>      "ao": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Angola",
>        "zone": "Africa/Luanda"
>      },
>      "aq": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Antarctica",
>        "zone": "Antarctica/McMurdo"
>      },
>      "ar": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Argentina",
>        "zone": "America/Argentina/Buenos_Aires"
>      },
>      "as": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "American Samoa",
>        "zone": "Pacific/Pago_Pago"
>      },
>      "at": {
>        "kmap": "de",
> -      "mirror": "ftp.at.debian.org",
>        "name": "Austria",
>        "zone": "Europe/Vienna"
>      },
>      "au": {
>        "kmap": "",
> -      "mirror": "ftp.au.debian.org",
>        "name": "Australia",
>        "zone": "Australia/Lord_Howe"
>      },
>      "aw": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Aruba",
>        "zone": "America/Aruba"
>      },
>      "ax": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Åland Islands",
>        "zone": "Europe/Mariehamn"
>      },
>      "az": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Azerbaijan",
>        "zone": "Asia/Baku"
>      },
>      "ba": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Bosnia and Herzegovina",
>        "zone": "Europe/Sarajevo"
>      },
>      "bb": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Barbados",
>        "zone": "America/Barbados"
>      },
>      "bd": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Bangladesh",
>        "zone": "Asia/Dhaka"
>      },
>      "be": {
>        "kmap": "fr-be",
> -      "mirror": "ftp.be.debian.org",
>        "name": "Belgium",
>        "zone": "Europe/Brussels"
>      },
>      "bf": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Burkina Faso",
>        "zone": "Africa/Ouagadougou"
>      },
>      "bg": {
>        "kmap": "",
> -      "mirror": "ftp.bg.debian.org",
>        "name": "Bulgaria",
>        "zone": "Europe/Sofia"
>      },
>      "bh": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Bahrain",
>        "zone": "Asia/Bahrain"
>      },
>      "bi": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Burundi",
>        "zone": "Africa/Bujumbura"
>      },
>      "bj": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Benin",
>        "zone": "Africa/Porto-Novo"
>      },
>      "bl": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Saint Barthélemy",
>        "zone": "America/St_Barthelemy"
>      },
>      "bm": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Bermuda",
>        "zone": "Atlantic/Bermuda"
>      },
>      "bn": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Brunei Darussalam",
>        "zone": "Asia/Brunei"
>      },
>      "bo": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Bolivia",
>        "zone": "America/La_Paz"
>      },
>      "bq": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Bonaire, Sint Eustatius and Saba",
>        "zone": "America/Kralendijk"
>      },
>      "br": {
>        "kmap": "pt-br",
> -      "mirror": "ftp.br.debian.org",
>        "name": "Brazil",
>        "zone": "America/Noronha"
>      },
>      "bs": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Bahamas",
>        "zone": "America/Nassau"
>      },
>      "bt": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Bhutan",
>        "zone": "Asia/Thimphu"
>      },
>      "bv": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Bouvet Island"
>      },
>      "bw": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Botswana",
>        "zone": "Africa/Gaborone"
>      },
>      "by": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Belarus",
>        "zone": "Europe/Minsk"
>      },
>      "bz": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Belize",
>        "zone": "America/Belize"
>      },
>      "ca": {
>        "kmap": "en-us",
> -      "mirror": "ftp.ca.debian.org",
>        "name": "Canada",
>        "zone": "America/St_Johns"
>      },
>      "cc": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Cocos (Keeling) Islands",
>        "zone": "Indian/Cocos"
>      },
>      "cd": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Congo, The Democratic Republic of the",
>        "zone": "Africa/Kinshasa"
>      },
>      "cf": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Central African Republic",
>        "zone": "Africa/Bangui"
>      },
>      "cg": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Congo",
>        "zone": "Africa/Brazzaville"
>      },
>      "ch": {
>        "kmap": "de-ch",
> -      "mirror": "ftp.ch.debian.org",
>        "name": "Switzerland",
>        "zone": "Europe/Zurich"
>      },
>      "ci": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Côte d'Ivoire",
>        "zone": "Africa/Abidjan"
>      },
>      "ck": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Cook Islands",
>        "zone": "Pacific/Rarotonga"
>      },
>      "cl": {
>        "kmap": "",
> -      "mirror": "ftp.cl.debian.org",
>        "name": "Chile",
>        "zone": "America/Santiago"
>      },
>      "cm": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Cameroon",
>        "zone": "Africa/Douala"
>      },
>      "cn": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "China",
>        "zone": "Asia/Shanghai"
>      },
>      "co": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Colombia",
>        "zone": "America/Bogota"
>      },
>      "cr": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Costa Rica",
>        "zone": "America/Costa_Rica"
>      },
>      "cu": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Cuba",
>        "zone": "America/Havana"
>      },
>      "cv": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Cabo Verde",
>        "zone": "Atlantic/Cape_Verde"
>      },
>      "cw": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Curaçao",
>        "zone": "America/Curacao"
>      },
>      "cx": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Christmas Island",
>        "zone": "Indian/Christmas"
>      },
>      "cy": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Cyprus",
>        "zone": "Asia/Nicosia"
>      },
>      "cz": {
>        "kmap": "",
> -      "mirror": "ftp.cz.debian.org",
>        "name": "Czechia",
>        "zone": "Europe/Prague"
>      },
>      "de": {
>        "kmap": "de",
> -      "mirror": "ftp.de.debian.org",
>        "name": "Germany",
>        "zone": "Europe/Berlin"
>      },
>      "dj": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Djibouti",
>        "zone": "Africa/Djibouti"
>      },
>      "dk": {
>        "kmap": "dk",
> -      "mirror": "ftp.dk.debian.org",
>        "name": "Denmark",
>        "zone": "Europe/Copenhagen"
>      },
>      "dm": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Dominica",
>        "zone": "America/Dominica"
>      },
>      "do": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Dominican Republic",
>        "zone": "America/Santo_Domingo"
>      },
>      "dz": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Algeria",
>        "zone": "Africa/Algiers"
>      },
>      "ec": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Ecuador",
>        "zone": "America/Guayaquil"
>      },
>      "ee": {
>        "kmap": "",
> -      "mirror": "ftp.ee.debian.org",
>        "name": "Estonia",
>        "zone": "Europe/Tallinn"
>      },
>      "eg": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Egypt",
>        "zone": "Africa/Cairo"
>      },
>      "eh": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Western Sahara",
>        "zone": "Africa/El_Aaiun"
>      },
>      "er": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Eritrea",
>        "zone": "Africa/Asmara"
>      },
>      "es": {
>        "kmap": "es",
> -      "mirror": "ftp.es.debian.org",
>        "name": "Spain",
>        "zone": "Europe/Madrid"
>      },
>      "et": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Ethiopia",
>        "zone": "Africa/Addis_Ababa"
>      },
>      "fi": {
>        "kmap": "fi",
> -      "mirror": "ftp.fi.debian.org",
>        "name": "Finland",
>        "zone": "Europe/Helsinki"
>      },
>      "fj": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Fiji",
>        "zone": "Pacific/Fiji"
>      },
>      "fk": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Falkland Islands (Malvinas)",
>        "zone": "Atlantic/Stanley"
>      },
>      "fm": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Micronesia, Federated States of",
>        "zone": "Pacific/Chuuk"
>      },
>      "fo": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Faroe Islands",
>        "zone": "Atlantic/Faroe"
>      },
>      "fr": {
>        "kmap": "fr",
> -      "mirror": "ftp.fr.debian.org",
>        "name": "France",
>        "zone": "Europe/Paris"
>      },
>      "ga": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Gabon",
>        "zone": "Africa/Libreville"
>      },
>      "gb": {
>        "kmap": "en-gb",
> -      "mirror": "ftp.uk.debian.org",
>        "name": "United Kingdom",
>        "zone": "Europe/London"
>      },
>      "gd": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Grenada",
>        "zone": "America/Grenada"
>      },
>      "ge": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Georgia",
>        "zone": "Asia/Tbilisi"
>      },
>      "gf": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "French Guiana",
>        "zone": "America/Cayenne"
>      },
>      "gg": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Guernsey",
>        "zone": "Europe/Guernsey"
>      },
>      "gh": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Ghana",
>        "zone": "Africa/Accra"
>      },
>      "gi": {
>        "kmap": "es",
> -      "mirror": "",
>        "name": "Gibraltar",
>        "zone": "Europe/Gibraltar"
>      },
>      "gl": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Greenland",
>        "zone": "America/Nuuk"
>      },
>      "gm": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Gambia",
>        "zone": "Africa/Banjul"
>      },
>      "gn": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Guinea",
>        "zone": "Africa/Conakry"
>      },
>      "gp": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Guadeloupe",
>        "zone": "America/Guadeloupe"
>      },
>      "gq": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Equatorial Guinea",
>        "zone": "Africa/Malabo"
>      },
>      "gr": {
>        "kmap": "",
> -      "mirror": "ftp.gr.debian.org",
>        "name": "Greece",
>        "zone": "Europe/Athens"
>      },
>      "gs": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "South Georgia and the South Sandwich Islands",
>        "zone": "Atlantic/South_Georgia"
>      },
>      "gt": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Guatemala",
>        "zone": "America/Guatemala"
>      },
>      "gu": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Guam",
>        "zone": "Pacific/Guam"
>      },
>      "gw": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Guinea-Bissau",
>        "zone": "Africa/Bissau"
>      },
>      "gy": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Guyana",
>        "zone": "America/Guyana"
>      },
>      "hk": {
>        "kmap": "",
> -      "mirror": "ftp.hk.debian.org",
>        "name": "Hong Kong",
>        "zone": "Asia/Hong_Kong"
>      },
>      "hm": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Heard Island and McDonald Islands"
>      },
>      "hn": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Honduras",
>        "zone": "America/Tegucigalpa"
>      },
>      "hr": {
>        "kmap": "",
> -      "mirror": "ftp.hr.debian.org",
>        "name": "Croatia",
>        "zone": "Europe/Zagreb"
>      },
>      "ht": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Haiti",
>        "zone": "America/Port-au-Prince"
>      },
>      "hu": {
>        "kmap": "hu",
> -      "mirror": "ftp.hu.debian.org",
>        "name": "Hungary",
>        "zone": "Europe/Budapest"
>      },
>      "id": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Indonesia",
>        "zone": "Asia/Jakarta"
>      },
>      "ie": {
>        "kmap": "",
> -      "mirror": "ftp.ie.debian.org",
>        "name": "Ireland",
>        "zone": "Europe/Dublin"
>      },
>      "il": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Israel",
>        "zone": "Asia/Jerusalem"
>      },
>      "im": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Isle of Man",
>        "zone": "Europe/Isle_of_Man"
>      },
>      "in": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "India",
>        "zone": "Asia/Kolkata"
>      },
>      "io": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "British Indian Ocean Territory",
>        "zone": "Indian/Chagos"
>      },
>      "iq": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Iraq",
>        "zone": "Asia/Baghdad"
>      },
>      "ir": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Iran",
>        "zone": "Asia/Tehran"
>      },
>      "is": {
>        "kmap": "is",
> -      "mirror": "ftp.is.debian.org",
>        "name": "Iceland",
>        "zone": "Atlantic/Reykjavik"
>      },
>      "it": {
>        "kmap": "it",
> -      "mirror": "ftp.it.debian.org",
>        "name": "Italy",
>        "zone": "Europe/Rome"
>      },
>      "je": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Jersey",
>        "zone": "Europe/Jersey"
>      },
>      "jm": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Jamaica",
>        "zone": "America/Jamaica"
>      },
>      "jo": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Jordan",
>        "zone": "Asia/Amman"
>      },
>      "jp": {
>        "kmap": "jp",
> -      "mirror": "ftp.jp.debian.org",
>        "name": "Japan",
>        "zone": "Asia/Tokyo"
>      },
>      "ke": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Kenya",
>        "zone": "Africa/Nairobi"
>      },
>      "kg": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Kyrgyzstan",
>        "zone": "Asia/Bishkek"
>      },
>      "kh": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Cambodia",
>        "zone": "Asia/Phnom_Penh"
>      },
>      "ki": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Kiribati",
>        "zone": "Pacific/Tarawa"
>      },
>      "km": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Comoros",
>        "zone": "Indian/Comoro"
>      },
>      "kn": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Saint Kitts and Nevis",
>        "zone": "America/St_Kitts"
>      },
>      "kp": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "North Korea",
>        "zone": "Asia/Pyongyang"
>      },
>      "kr": {
>        "kmap": "",
> -      "mirror": "ftp.kr.debian.org",
>        "name": "South Korea",
>        "zone": "Asia/Seoul"
>      },
>      "kw": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Kuwait",
>        "zone": "Asia/Kuwait"
>      },
>      "ky": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Cayman Islands",
>        "zone": "America/Cayman"
>      },
>      "kz": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Kazakhstan",
>        "zone": "Asia/Almaty"
>      },
>      "la": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Laos",
>        "zone": "Asia/Vientiane"
>      },
>      "lb": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Lebanon",
>        "zone": "Asia/Beirut"
>      },
>      "lc": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Saint Lucia",
>        "zone": "America/St_Lucia"
>      },
>      "li": {
>        "kmap": "de-ch",
> -      "mirror": "",
>        "name": "Liechtenstein",
>        "zone": "Europe/Vaduz"
>      },
>      "lk": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Sri Lanka",
>        "zone": "Asia/Colombo"
>      },
>      "lr": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Liberia",
>        "zone": "Africa/Monrovia"
>      },
>      "ls": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Lesotho",
>        "zone": "Africa/Maseru"
>      },
>      "lt": {
>        "kmap": "lt",
> -      "mirror": "",
>        "name": "Lithuania",
>        "zone": "Europe/Vilnius"
>      },
>      "lu": {
>        "kmap": "fr-ch",
> -      "mirror": "",
>        "name": "Luxembourg",
>        "zone": "Europe/Luxembourg"
>      },
>      "lv": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Latvia",
>        "zone": "Europe/Riga"
>      },
>      "ly": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Libya",
>        "zone": "Africa/Tripoli"
>      },
>      "ma": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Morocco",
>        "zone": "Africa/Casablanca"
>      },
>      "mc": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Monaco",
>        "zone": "Europe/Monaco"
>      },
>      "md": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Moldova",
>        "zone": "Europe/Chisinau"
>      },
>      "me": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Montenegro",
>        "zone": "Europe/Podgorica"
>      },
>      "mf": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Saint Martin (French part)",
>        "zone": "America/Marigot"
>      },
>      "mg": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Madagascar",
>        "zone": "Indian/Antananarivo"
>      },
>      "mh": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Marshall Islands",
>        "zone": "Pacific/Majuro"
>      },
>      "mk": {
>        "kmap": "mk",
> -      "mirror": "",
>        "name": "North Macedonia",
>        "zone": "Europe/Skopje"
>      },
>      "ml": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Mali",
>        "zone": "Africa/Bamako"
>      },
>      "mm": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Myanmar",
>        "zone": "Asia/Yangon"
>      },
>      "mn": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Mongolia",
>        "zone": "Asia/Ulaanbaatar"
>      },
>      "mo": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Macao",
>        "zone": "Asia/Macau"
>      },
>      "mp": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Northern Mariana Islands",
>        "zone": "Pacific/Saipan"
>      },
>      "mq": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Martinique",
>        "zone": "America/Martinique"
>      },
>      "mr": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Mauritania",
>        "zone": "Africa/Nouakchott"
>      },
>      "ms": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Montserrat",
>        "zone": "America/Montserrat"
>      },
>      "mt": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Malta",
>        "zone": "Europe/Malta"
>      },
>      "mu": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Mauritius",
>        "zone": "Indian/Mauritius"
>      },
>      "mv": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Maldives",
>        "zone": "Indian/Maldives"
>      },
>      "mw": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Malawi",
>        "zone": "Africa/Blantyre"
>      },
>      "mx": {
>        "kmap": "",
> -      "mirror": "ftp.mx.debian.org",
>        "name": "Mexico",
>        "zone": "America/Mexico_City"
>      },
>      "my": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Malaysia",
>        "zone": "Asia/Kuala_Lumpur"
>      },
>      "mz": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Mozambique",
>        "zone": "Africa/Maputo"
>      },
>      "na": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Namibia",
>        "zone": "Africa/Windhoek"
>      },
>      "nc": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "New Caledonia",
>        "zone": "Pacific/Noumea"
>      },
>      "ne": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Niger",
>        "zone": "Africa/Niamey"
>      },
>      "nf": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Norfolk Island",
>        "zone": "Pacific/Norfolk"
>      },
>      "ng": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Nigeria",
>        "zone": "Africa/Lagos"
>      },
>      "ni": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Nicaragua",
>        "zone": "America/Managua"
>      },
>      "nl": {
>        "kmap": "en-us",
> -      "mirror": "ftp.nl.debian.org",
>        "name": "Netherlands",
>        "zone": "Europe/Amsterdam"
>      },
>      "no": {
>        "kmap": "no",
> -      "mirror": "ftp.no.debian.org",
>        "name": "Norway",
>        "zone": "Europe/Oslo"
>      },
>      "np": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Nepal",
>        "zone": "Asia/Kathmandu"
>      },
>      "nr": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Nauru",
>        "zone": "Pacific/Nauru"
>      },
>      "nu": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Niue",
>        "zone": "Pacific/Niue"
>      },
>      "nz": {
>        "kmap": "",
> -      "mirror": "ftp.nz.debian.org",
>        "name": "New Zealand",
>        "zone": "Pacific/Auckland"
>      },
>      "om": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Oman",
>        "zone": "Asia/Muscat"
>      },
>      "pa": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Panama",
>        "zone": "America/Panama"
>      },
>      "pe": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Peru",
>        "zone": "America/Lima"
>      },
>      "pf": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "French Polynesia",
>        "zone": "Pacific/Tahiti"
>      },
>      "pg": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Papua New Guinea",
>        "zone": "Pacific/Port_Moresby"
>      },
>      "ph": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Philippines",
>        "zone": "Asia/Manila"
>      },
>      "pk": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Pakistan",
>        "zone": "Asia/Karachi"
>      },
>      "pl": {
>        "kmap": "pl",
> -      "mirror": "ftp.pl.debian.org",
>        "name": "Poland",
>        "zone": "Europe/Warsaw"
>      },
>      "pm": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Saint Pierre and Miquelon",
>        "zone": "America/Miquelon"
>      },
>      "pn": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Pitcairn",
>        "zone": "Pacific/Pitcairn"
>      },
>      "pr": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Puerto Rico",
>        "zone": "America/Puerto_Rico"
>      },
>      "ps": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Palestine, State of",
>        "zone": "Asia/Gaza"
>      },
>      "pt": {
>        "kmap": "pt",
> -      "mirror": "ftp.pt.debian.org",
>        "name": "Portugal",
>        "zone": "Europe/Lisbon"
>      },
>      "pw": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Palau",
>        "zone": "Pacific/Palau"
>      },
>      "py": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Paraguay",
>        "zone": "America/Asuncion"
>      },
>      "qa": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Qatar",
>        "zone": "Asia/Qatar"
>      },
>      "re": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Réunion",
>        "zone": "Indian/Reunion"
>      },
>      "ro": {
>        "kmap": "",
> -      "mirror": "ftp.ro.debian.org",
>        "name": "Romania",
>        "zone": "Europe/Bucharest"
>      },
>      "rs": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Serbia",
>        "zone": "Europe/Belgrade"
>      },
>      "ru": {
>        "kmap": "",
> -      "mirror": "ftp.ru.debian.org",
>        "name": "Russian Federation",
>        "zone": "Europe/Kaliningrad"
>      },
>      "rw": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Rwanda",
>        "zone": "Africa/Kigali"
>      },
>      "sa": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Saudi Arabia",
>        "zone": "Asia/Riyadh"
>      },
>      "sb": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Solomon Islands",
>        "zone": "Pacific/Guadalcanal"
>      },
>      "sc": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Seychelles",
>        "zone": "Indian/Mahe"
>      },
>      "sd": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Sudan",
>        "zone": "Africa/Khartoum"
>      },
>      "se": {
>        "kmap": "",
> -      "mirror": "ftp.se.debian.org",
>        "name": "Sweden",
>        "zone": "Europe/Stockholm"
>      },
>      "sg": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Singapore",
>        "zone": "Asia/Singapore"
>      },
>      "sh": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Saint Helena, Ascension and Tristan da Cunha",
>        "zone": "Atlantic/St_Helena"
>      },
>      "si": {
>        "kmap": "si",
> -      "mirror": "ftp.si.debian.org",
>        "name": "Slovenia",
>        "zone": "Europe/Ljubljana"
>      },
>      "sj": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Svalbard and Jan Mayen",
>        "zone": "Arctic/Longyearbyen"
>      },
>      "sk": {
>        "kmap": "",
> -      "mirror": "ftp.sk.debian.org",
>        "name": "Slovakia",
>        "zone": "Europe/Bratislava"
>      },
>      "sl": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Sierra Leone",
>        "zone": "Africa/Freetown"
>      },
>      "sm": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "San Marino",
>        "zone": "Europe/San_Marino"
>      },
>      "sn": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Senegal",
>        "zone": "Africa/Dakar"
>      },
>      "so": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Somalia",
>        "zone": "Africa/Mogadishu"
>      },
>      "sr": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Suriname",
>        "zone": "America/Paramaribo"
>      },
>      "ss": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "South Sudan",
>        "zone": "Africa/Juba"
>      },
>      "st": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Sao Tome and Principe",
>        "zone": "Africa/Sao_Tome"
>      },
>      "sv": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "El Salvador",
>        "zone": "America/El_Salvador"
>      },
>      "sx": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Sint Maarten (Dutch part)",
>        "zone": "America/Lower_Princes"
>      },
>      "sy": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Syria",
>        "zone": "Asia/Damascus"
>      },
>      "sz": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Eswatini",
>        "zone": "Africa/Mbabane"
>      },
>      "tc": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Turks and Caicos Islands",
>        "zone": "America/Grand_Turk"
>      },
>      "td": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Chad",
>        "zone": "Africa/Ndjamena"
>      },
>      "tf": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "French Southern Territories",
>        "zone": "Indian/Kerguelen"
>      },
>      "tg": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Togo",
>        "zone": "Africa/Lome"
>      },
>      "th": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Thailand",
>        "zone": "Asia/Bangkok"
>      },
>      "tj": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Tajikistan",
>        "zone": "Asia/Dushanbe"
>      },
>      "tk": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Tokelau",
>        "zone": "Pacific/Fakaofo"
>      },
>      "tl": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Timor-Leste",
>        "zone": "Asia/Dili"
>      },
>      "tm": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Turkmenistan",
>        "zone": "Asia/Ashgabat"
>      },
>      "tn": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Tunisia",
>        "zone": "Africa/Tunis"
>      },
>      "to": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Tonga",
>        "zone": "Pacific/Tongatapu"
>      },
>      "tr": {
>        "kmap": "",
> -      "mirror": "ftp.tr.debian.org",
>        "name": "Türkiye",
>        "zone": "Europe/Istanbul"
>      },
>      "tt": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Trinidad and Tobago",
>        "zone": "America/Port_of_Spain"
>      },
>      "tv": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Tuvalu",
>        "zone": "Pacific/Funafuti"
>      },
>      "tw": {
>        "kmap": "",
> -      "mirror": "ftp.tw.debian.org",
>        "name": "Taiwan",
>        "zone": "Asia/Taipei"
>      },
>      "tz": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Tanzania",
>        "zone": "Africa/Dar_es_Salaam"
>      },
>      "ua": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Ukraine",
>        "zone": "Europe/Simferopol"
>      },
>      "ug": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Uganda",
>        "zone": "Africa/Kampala"
>      },
>      "um": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "United States Minor Outlying Islands",
>        "zone": "Pacific/Midway"
>      },
>      "us": {
>        "kmap": "en-us",
> -      "mirror": "ftp.us.debian.org",
>        "name": "United States",
>        "zone": "America/New_York"
>      },
>      "uy": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Uruguay",
>        "zone": "America/Montevideo"
>      },
>      "uz": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Uzbekistan",
>        "zone": "Asia/Samarkand"
>      },
>      "va": {
>        "kmap": "it",
> -      "mirror": "",
>        "name": "Holy See (Vatican City State)",
>        "zone": "Europe/Vatican"
>      },
>      "vc": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Saint Vincent and the Grenadines",
>        "zone": "America/St_Vincent"
>      },
>      "ve": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Venezuela",
>        "zone": "America/Caracas"
>      },
>      "vg": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Virgin Islands, British",
>        "zone": "America/Tortola"
>      },
>      "vi": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Virgin Islands, U.S.",
>        "zone": "America/St_Thomas"
>      },
>      "vn": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Vietnam",
>        "zone": "Asia/Ho_Chi_Minh"
>      },
>      "vu": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Vanuatu",
>        "zone": "Pacific/Efate"
>      },
>      "wf": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Wallis and Futuna",
>        "zone": "Pacific/Wallis"
>      },
>      "ws": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Samoa",
>        "zone": "Pacific/Apia"
>      },
>      "ye": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Yemen",
>        "zone": "Asia/Aden"
>      },
>      "yt": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Mayotte",
>        "zone": "Indian/Mayotte"
>      },
>      "za": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "South Africa",
>        "zone": "Africa/Johannesburg"
>      },
>      "zm": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Zambia",
>        "zone": "Africa/Lusaka"
>      },
>      "zw": {
>        "kmap": "",
> -      "mirror": "",
>        "name": "Zimbabwe",
>        "zone": "Africa/Harare"
>      }



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [pve-devel] [PATCH installer v3 0/3] remove mirror selection from installer
  2025-09-22 12:11 [pve-devel] [PATCH installer v3 0/3] remove mirror selection from installer Shannon Sterz
                   ` (2 preceding siblings ...)
  2025-09-22 12:11 ` [pve-devel] [PATCH installer v3 3/3] html/country: update explanatory text to not mention setting a mirror Shannon Sterz
@ 2025-11-04 13:25 ` Christoph Heiss
  3 siblings, 0 replies; 6+ messages in thread
From: Christoph Heiss @ 2025-11-04 13:25 UTC (permalink / raw)
  To: Shannon Sterz; +Cc: Proxmox VE development discussion

Applied the patches (fixing up patch #2 as needed) and built an ISO.

Checked that installation works fine and that /etc/apt/sources.list does
not get modified anymore.

Other than needing the rebase, please consider the series:

Reviewed-by: Christoph Heiss <c.heiss@proxmox.com>
Tested-by: Christoph Heiss <c.heiss@proxmox.com>

On Mon Sep 22, 2025 at 2:11 PM CEST, Shannon Sterz wrote:
> these three patches remove the debian mirror selection from the
> installer as it is no longer needed. debian recommends using its CDN
> these days [1]. so we don't need to select a mirror.
>
> [1]: https://www.debian.org/releases/trixie/release-notes/upgrading.en.html#adding-apt-internet-sources
>
> Changelog
> ---------
>
> changes since v2, thanks @ Christoph Heiss:
>
> - remove the mirror entries from
>   `proxmox-auto-installer/tests/resources/locales.json`
>
> changes since v1, thanks @ Fiona Ebner:
>
> - add a patch that removes generating the mirror information from
>   country.pl
> - add a patch rephrasing the installers text to remove mentions of
>   selecting a mirror.
>
>
> Shannon Sterz (3):
>   install: don't select a debian mirror based on the country anymore
>   country.pl: remove generating mirror information
>   html/country: update explanatory text to not mention setting a mirror
>
>  Proxmox/Install.pm                            |   6 -
>  country.pl                                    |  12 +-
>  html/country.htm                              |   9 +-
>  .../tests/resources/locales.json              | 249 ------------------
>  4 files changed, 5 insertions(+), 271 deletions(-)
>
> --
> 2.47.3
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2025-11-04 13:24 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-09-22 12:11 [pve-devel] [PATCH installer v3 0/3] remove mirror selection from installer Shannon Sterz
2025-09-22 12:11 ` [pve-devel] [PATCH installer v3 1/3] install: don't select a debian mirror based on the country anymore Shannon Sterz
2025-09-22 12:11 ` [pve-devel] [PATCH installer v3 2/3] country.pl: remove generating mirror information Shannon Sterz
2025-11-04 12:29   ` Christoph Heiss
2025-09-22 12:11 ` [pve-devel] [PATCH installer v3 3/3] html/country: update explanatory text to not mention setting a mirror Shannon Sterz
2025-11-04 13:25 ` [pve-devel] [PATCH installer v3 0/3] remove mirror selection from installer Christoph Heiss

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal