debian: fix debian-security/debug url when using a mirror

[yadutaf]

debian-security and debian-debug are typically not mirrored, even though they sometimes are. Up to the introduction of the Snapshot= setting in #3802, the URL for such repositories was hard-coded. It was then moved to the selected mirror which no longer matches and the comment and may fail depending on the selected mirror.

This commit reverts to the hard-coded variant to fix the build of Debian images when using an explicit mirror but no snapshots.

[behrmann]

Sorry, if this is coming on standoffish, but this is weird behaviour. First time contributor and then approval by three people who I don't remember ever seeing doing anything in this repository with?

As for the change: You will probably be served best by providing your own apt config in a sandbox tree, the apt config mkosi generates is the mkosi.sources file, which it doesn't overwrite, if it already exists.

Probably a better change is to properly document this escape hatch, specifically that the file is called mkosi.sources in the man page so nobody has to look into the code.

[yadutaf]

Sorry, if this is coming on standoffish, but this is weird behaviour. First time contributor and then approval by three people who I don't remember ever seeing doing anything in this repository with?

@behrmann I totally understand. We are working together, if this may give some context. 😅

As for the change: You will probably be served best by providing your own apt config in a sandbox tree, the apt config mkosi generates is the mkosi.sources file, which it doesn't overwrite, if it already exists.

I also tested it and it works perfectly fine. I will need this in the future for my final use-case anyway. I only stumbled upon this bug by "chance" while checking a minimal image with only official Debian packages, but from a local mirror. This is how I realized that using a custom mirror with the "Mirror" setting is broken for Debian while it is working for Arch, openSUSE and centOS (I only tested these).

Since this looks like an accidental regression of #3802, I submitted a quick fix, in case this is helpful.

If you take the official French mirror for instance, http://ftp.fr.debian.org/debian/ works, http://ftp.fr.debian.org/debian-security/ works as well (but not on all mirrors, like Croatia "hr") and http://ftp.fr.debian.org/debian-debug/ does not.

[bluca]

Since this looks like an accidental regression of #3802, I submitted a quick fix, in case this is helpful.

yeah this is a regression everything else non-withstanding, the security repo must not be mirrored