Merge "debian-minimal: bullseye: /updates -> -security"

This commit is contained in:
Zuul 2021-04-30 09:25:35 +00:00 committed by Gerrit Code Review
commit cb0c117659

View File

@ -13,15 +13,16 @@ export DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://deb.debian.org/
# choice is for people to add it separately, otherwise we use # choice is for people to add it separately, otherwise we use
# upstream. # upstream.
DIB_DEBIAN_SECURITY_MIRROR=${DIB_DEBIAN_SECURITY_MIRROR:-http://security.debian.org/} DIB_DEBIAN_SECURITY_MIRROR=${DIB_DEBIAN_SECURITY_MIRROR:-http://security.debian.org/}
DIB_DEBIAN_SECURITY_SUBPATH=${DIB_DEBIAN_SECURITY_SUBPATH:-/updates}
export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main} export DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main}
export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ } export DIB_DEBIAN_COMPONENTS_WS=${DIB_DEBIAN_COMPONENTS//,/ }
if [ "${DIB_RELEASE}" = "bullseye" ]; then if [ "${DIB_RELEASE}" = "bullseye" ]; then
DIB_DEBIAN_SECURITY_PATH="${DIB_RELEASE}-security" DIB_DEBIAN_SECURITY_PATH="${DIB_RELEASE}-security"
DIB_DEBIAN_SECURITY_SUBPATH=${DIB_DEBIAN_SECURITY_SUBPATH:-}
else else
DIB_DEBIAN_SECURITY_PATH="${DIB_RELEASE}" DIB_DEBIAN_SECURITY_PATH="${DIB_RELEASE}"
DIB_DEBIAN_SECURITY_SUBPATH=${DIB_DEBIAN_SECURITY_SUBPATH:-/updates}
fi fi
DIB_APT_SOURCES_CONF_DEFAULT=\ DIB_APT_SOURCES_CONF_DEFAULT=\