openstack/diskimage-builder
Code Issues Proposed changes

Drop unnecessary debian security location configuration switch

Browse Source 
At some point Debian changed the way that security package repos are
hosted. This affected their location and the apt sources.list
configuration. At this point all modern debian releases use a single
security location. Update DIB to drop the configuration switch so that
we don't have to update it for every release and instead support only
the modern configuration.

People needing to build old versions of debian can use old versions of
DIB.

Change-Id: I8c452c50b1d10a030124b7ac264e494350147b58
Signed-off-by: Clark Boylan <clark.boylan@gmail.com>
This commit is contained in:
Clark Boylan
2025-08-26 11:40:32 -07:00
parent 01b80d76d3
commit 2974d223d2
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
diskimage_builder/elements/debian-minimal/environment.d/10-debian-minimal.bash
View File

@@ -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}

9
releasenotes/notes/debian-security-location-bae198f54610fe3f.yaml Normal file
View File

@@ -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.