Use $CODENAME/updates for security pre-bullseye

or $CODENAME-security for bullseye onwards.

Backported from master
This commit is contained in:
Steve McIntyre 2021-08-15 11:48:46 +01:00
parent 92e93a9133
commit 7960fd976e
2 changed files with 16 additions and 1 deletions

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
debian-cd (3.1.35+deb11u1) UNRELEASED; urgency=medium
[ Steve McIntyre ]
Backports from master for bullseye builds:
* Use $CODENAME/updates for security pre-bullseye, or
$CODENAME-security for bullseye onwards.
-- Steve McIntyre <93sam@debian.org> Mon, 26 Jul 2021 01:02:03 +0100
debian-cd (3.1.35) unstable; urgency=medium debian-cd (3.1.35) unstable; urgency=medium
[ Steve McIntyre ] [ Steve McIntyre ]

View File

@ -95,7 +95,12 @@ if [ ! -e "$APTTMP/$THIS_PKGSET/apt/sources.list" ]; then
# Security mirror ... # Security mirror ...
if [ -n "$SECURITY" ]; then if [ -n "$SECURITY" ]; then
echo "$ADEB file:${SECURITY:-$MIRROR} $CODENAME/updates $sections" \ case $CODENAME in
stretch|buster) SEC=$CODENAME/updates;;
*) SEC=$CODENAME-security;;
esac
echo "$ADEB file:${SECURITY:-$MIRROR} $SEC $sections" \
>> $APTTMP/$THIS_PKGSET/apt/sources.list >> $APTTMP/$THIS_PKGSET/apt/sources.list
fi fi