diff --git a/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash b/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash index 0396528d4..23f1ec31f 100644 --- a/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash +++ b/diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash @@ -17,16 +17,8 @@ DIB_DEBIAN_SECURITY_MIRROR=${DIB_DEBIAN_SECURITY_MIRROR:-http://security.debian. export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main} export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ } -case "${DIB_RELEASE}" in - bookworm|bullseye|stable|testing) - DIB_DEBIAN_SECURITY_PATH="${DIB_RELEASE}-security" - DIB_DEBIAN_SECURITY_SUBPATH=${DIB_DEBIAN_SECURITY_SUBPATH:-} - ;; - *) - DIB_DEBIAN_SECURITY_PATH="${DIB_RELEASE}" - DIB_DEBIAN_SECURITY_SUBPATH=${DIB_DEBIAN_SECURITY_SUBPATH:-/updates} - ;; -esac +DIB_DEBIAN_SECURITY_PATH="${DIB_RELEASE}-security" +DIB_DEBIAN_SECURITY_SUBPATH=${DIB_DEBIAN_SECURITY_SUBPATH:-} DIB_APT_SOURCES_CONF_DEFAULT=\ "default:deb ${DIB_DISTRIBUTION_MIRROR} ${DIB_RELEASE} ${DIB_DEBIAN_COMPONENTS_WS} diff --git a/releasenotes/notes/debian-security-location-bae198f54610fe3f.yaml b/releasenotes/notes/debian-security-location-bae198f54610fe3f.yaml new file mode 100644 index 000000000..849424785 --- /dev/null +++ b/releasenotes/notes/debian-security-location-bae198f54610fe3f.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - | + Debian changed locations for its security package repos. We had been + accounting for that with specific overrides for some time. Enough time + has now passed where all modern Debian releases use a consistent + security package repo location so we have dropped the special accounting + to make adding new Debian releases simpler. Note, this means DIB no + longer supports building Debian older than Bullseye.