public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] [PATCH installer v2] install: don't select a debian mirror based on the country anymore
@ 2025-07-31  9:15 Shannon Sterz
  2025-09-17 13:38 ` Fiona Ebner
  0 siblings, 1 reply; 4+ messages in thread
From: Shannon Sterz @ 2025-07-31  9:15 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

Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
---

changes since v1:

- instead of adapting how we set mirrors to the new deb822 format,
  simply remove this code altogether in favor of using the cdn.

 Proxmox/Install.pm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm
index 3159dcc..5d77821 100644
--- a/Proxmox/Install.pm
+++ b/Proxmox/Install.pm
@@ -1316,12 +1316,6 @@ _EOD
         symlink("/usr/share/zoneinfo/$timezone", "$targetdir/etc/localtime");
         file_write_all("$targetdir/etc/timezone", "$timezone\n");

-        # 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.2



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


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

* Re: [pve-devel] [PATCH installer v2] install: don't select a debian mirror based on the country anymore
  2025-07-31  9:15 [pve-devel] [PATCH installer v2] install: don't select a debian mirror based on the country anymore Shannon Sterz
@ 2025-09-17 13:38 ` Fiona Ebner
       [not found]   ` <DCZ6WNQMF79O.DMXTYQWLXMHD@proxmox.com>
  0 siblings, 1 reply; 4+ messages in thread
From: Fiona Ebner @ 2025-09-17 13:38 UTC (permalink / raw)
  To: Proxmox VE development discussion, Shannon Sterz

Am 31.07.25 um 11:15 AM schrieb 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
> 
> Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>

Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>

We could also go ahead and remove adding the mirror information to the
country hash in country.pl after this change.

html/country.htm also should be updated:

The Proxmox Installer automatically makes location-based optimizations,
like choosing the nearest mirror to download files from.

since it's not the Installer itself doing that anymore.

> ---
> 
> changes since v1:
> 
> - instead of adapting how we set mirrors to the new deb822 format,
>   simply remove this code altogether in favor of using the cdn.
> 
>  Proxmox/Install.pm | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm
> index 3159dcc..5d77821 100644
> --- a/Proxmox/Install.pm
> +++ b/Proxmox/Install.pm
> @@ -1316,12 +1316,6 @@ _EOD
>          symlink("/usr/share/zoneinfo/$timezone", "$targetdir/etc/localtime");
>          file_write_all("$targetdir/etc/timezone", "$timezone\n");
> 
> -        # 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.2


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


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

* Re: [pve-devel] [PATCH installer v2] install: don't select a debian mirror based on the country anymore
       [not found]   ` <DCZ6WNQMF79O.DMXTYQWLXMHD@proxmox.com>
@ 2025-09-22  8:56     ` Fiona Ebner
  2025-09-22  9:11       ` [pve-devel] Superseded: " Shannon Sterz
  0 siblings, 1 reply; 4+ messages in thread
From: Fiona Ebner @ 2025-09-22  8:56 UTC (permalink / raw)
  To: Shannon Sterz; +Cc: Proxmox VE development discussion

Am 22.09.25 um 10:35 AM schrieb Shannon Sterz:
> On Wed Sep 17, 2025 at 3:38 PM CEST, Fiona Ebner wrote:
>> Am 31.07.25 um 11:15 AM schrieb 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
>>>
>>> Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
>>
>> Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
>>
>> We could also go ahead and remove adding the mirror information to the
>> country hash in country.pl after this change.
>>
>> html/country.htm also should be updated:
>>
>> The Proxmox Installer automatically makes location-based optimizations,
>> like choosing the nearest mirror to download files from.
>>
>> since it's not the Installer itself doing that anymore.
> 
> alright, but we'll need to make some more fix-ups there actually.

Oh, good catch!

> would suggest the following:
> 
>> The Proxmox Installer will set up your time zone and keyboard layout.
>> Ensuring that your system behaves as intended once it is up and
>> running.
> 
> not really sure what we can say here other than that, as imo most of the
> setup here is fairly self explanatory. the country is now only used to
> narrow the selection of time zones from what i can tell, so we need to
> adapt the text for that too. something like this maybe:
> 
>> Country: Narrows down the selection of time zones to make selection
>> easier.
> 
> what do you think?

Sounds good to me. Except maybe we can avoid using "selection" twice?
Maybe the "the available time zones"?


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


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

* [pve-devel] Superseded: Re: [PATCH installer v2] install: don't select a debian mirror based on the country anymore
  2025-09-22  8:56     ` Fiona Ebner
@ 2025-09-22  9:11       ` Shannon Sterz
  0 siblings, 0 replies; 4+ messages in thread
From: Shannon Sterz @ 2025-09-22  9:11 UTC (permalink / raw)
  To: Fiona Ebner; +Cc: Proxmox VE development discussion

On Mon Sep 22, 2025 at 10:56 AM CEST, Fiona Ebner wrote:
> Am 22.09.25 um 10:35 AM schrieb Shannon Sterz:
>> On Wed Sep 17, 2025 at 3:38 PM CEST, Fiona Ebner wrote:
>>> Am 31.07.25 um 11:15 AM schrieb 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
>>>>
>>>> Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
>>>
>>> Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
>>>
>>> We could also go ahead and remove adding the mirror information to the
>>> country hash in country.pl after this change.
>>>
>>> html/country.htm also should be updated:
>>>
>>> The Proxmox Installer automatically makes location-based optimizations,
>>> like choosing the nearest mirror to download files from.
>>>
>>> since it's not the Installer itself doing that anymore.
>>
>> alright, but we'll need to make some more fix-ups there actually.
>
> Oh, good catch!
>
>> would suggest the following:
>>
>>> The Proxmox Installer will set up your time zone and keyboard layout.
>>> Ensuring that your system behaves as intended once it is up and
>>> running.
>>
>> not really sure what we can say here other than that, as imo most of the
>> setup here is fairly self explanatory. the country is now only used to
>> narrow the selection of time zones from what i can tell, so we need to
>> adapt the text for that too. something like this maybe:
>>
>>> Country: Narrows down the selection of time zones to make selection
>>> easier.
>>
>> what do you think?
>
> Sounds good to me. Except maybe we can avoid using "selection" twice?
> Maybe the "the available time zones"?

yep makes sense, consider this

Superseded-by: https://lore.proxmox.com/pve-devel/20250922090855.58508-2-s.sterz@proxmox.com/

thanks!


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


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

end of thread, other threads:[~2025-09-22  9:11 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-07-31  9:15 [pve-devel] [PATCH installer v2] install: don't select a debian mirror based on the country anymore Shannon Sterz
2025-09-17 13:38 ` Fiona Ebner
     [not found]   ` <DCZ6WNQMF79O.DMXTYQWLXMHD@proxmox.com>
2025-09-22  8:56     ` Fiona Ebner
2025-09-22  9:11       ` [pve-devel] Superseded: " Shannon Sterz

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