[pve-devel] [PATCH installer v2 0/3] remove mirror selection from installer

[pve-devel] [PATCH installer v2 0/3] remove mirror selection from installer

[Shannon Sterz]

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 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 +++------
 3 files changed, 5 insertions(+), 22 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] [PATCH installer v2 1/3] install: don't select a debian mirror based on the country anymore

[Shannon Sterz]

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

[pve-devel] [PATCH installer v2 2/3] country.pl: remove generating mirror information

[Shannon Sterz]

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 ++----------
 1 file changed, 2 insertions(+), 10 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);
 
-- 
2.47.3



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

[pve-devel] [PATCH installer v2 3/3] html/country: update explanatory text to not mention setting a mirror

[Shannon Sterz]

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

Re: [pve-devel] [PATCH installer v2 2/3] country.pl: remove generating mirror information

[Christoph Heiss]

On Mon Sep 22, 2025 at 11:08 AM CEST, Shannon Sterz wrote:
> this is no longer needed, as we don't rely on this information in the
> installer anymore.

`proxmox-auto-installer/tests/resources/locales.json` can/should also be
updated correspondingly.

Although it doesn't cause any errors (since we ignore unknown fields
when deserializing), keeping it in sync would still be good.

>
> Suggested-by: Fiona Ebner <f.ebner@proxmox.com>
> Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
> ---
>  country.pl | 12 ++----------
>  1 file changed, 2 insertions(+), 10 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);
>



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

Re: [pve-devel] [PATCH installer v2 2/3] country.pl: remove generating mirror information

[Shannon Sterz]

On Mon Sep 22, 2025 at 12:33 PM CEST, Christoph Heiss wrote:
> On Mon Sep 22, 2025 at 11:08 AM CEST, Shannon Sterz wrote:
>> this is no longer needed, as we don't rely on this information in the
>> installer anymore.
>
> `proxmox-auto-installer/tests/resources/locales.json` can/should also be
> updated correspondingly.
>
> Although it doesn't cause any errors (since we ignore unknown fields
> when deserializing), keeping it in sync would still be good.

ah yeah makes sense, i'll send a v3 with that included.

>>
>> Suggested-by: Fiona Ebner <f.ebner@proxmox.com>
>> Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
>> ---
>>  country.pl | 12 ++----------
>>  1 file changed, 2 insertions(+), 10 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);
>>



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

[pve-devel] Superseded: Re: [PATCH installer v2 0/3] remove mirror selection from installer

[Shannon Sterz]

On Mon Sep 22, 2025 at 11:08 AM 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 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 +++------
>  3 files changed, 5 insertions(+), 22 deletions(-)
>
> --
> 2.47.3

Superseded-by: https://lore.proxmox.com/all/20250922121103.206711-2-s.sterz@proxmox.com/


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