openstack/diskimage-builder
Code Issues Proposed changes

Merge "Fix setting apt mirror for noble"

Browse Source
This commit is contained in:
Zuul 2024-06-26 20:20:45 +00:00 committed by Gerrit Code Review
commit 7d0fa0b737
1 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
diskimage_builder/elements/ubuntu/pre-install.d/01-set-ubuntu-mirror
View File

@ -7,24 +7,50 @@ set -eu
set -o pipefail set -o pipefail
DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-} DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-}
SIGNED_BY=${SIGNED_BY:-}
DEB822_SOURCES_FILE=/etc/apt/sources.list.d/ubuntu.sources
[[ -n "$DIB_DISTRIBUTION_MIRROR" ]] || exit 0 if [[ -z "$DIB_DISTRIBUTION_MIRROR" ]]; then
echo "DIB_DISTRIBUTION_MIRROR is empty"
exit 0
fi
while IFS= read line # ubuntu versions > jammy use https://repolib.readthedocs.io/en/latest/deb822-format.html
do # check if the sources file is in the sources.list.d directory.
if [[ -n "${DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE:-}" && "$line" =~ ${DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE:-} ]]; then if [[ -f "$DEB822_SOURCES_FILE" ]]; then
# append line unmodified # ubuntu > jammy
echo "$line" | tee --append /etc/apt/sources.list.new while IFS= read line
else do
echo "$line" | \ if [[ -n "${DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE:-}" && "$line" =~ ${DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE:-} ]]; then
sed -e "s&http://\(archive\|security\).ubuntu.com/ubuntu&$DIB_DISTRIBUTION_MIRROR&" | \ # append line unmodified
tee --append /etc/apt/sources.list.new echo "$line" | tee --append /etc/apt/sources.list.d/ubuntu.sources.new
fi else
done < /etc/apt/sources.list if [[ "$line" == URIs:* ]]; then
line=$(echo "$line" | sed -e "s&http://\(archive\|security\).ubuntu.com/ubuntu&$DIB_DISTRIBUTION_MIRROR&")
elif [[ -n "$SIGNED_BY" && "$line" == Signed-By:* ]]; then
line="Signed-By: $SIGNED_BY"
fi
echo "$line" | tee --append /etc/apt/sources.list.d/ubuntu.sources.new
fi
done < /etc/apt/sources.list.d/ubuntu.sources
mv /etc/apt/sources.list.d/ubuntu.sources.new /etc/apt/sources.list.d/ubuntu.sources
else
# ubuntu <= jammy
while IFS= read line
do
if [[ -n "${DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE:-}" && "$line" =~ ${DIB_DISTRIBUTION_MIRROR_UBUNTU_IGNORE:-} ]]; then
# append line unmodified
echo "$line" | tee --append /etc/apt/sources.list.new
else
echo "$line" | \
sed -e "s&http://\(archive\|security\).ubuntu.com/ubuntu&$DIB_DISTRIBUTION_MIRROR&" | \
tee --append /etc/apt/sources.list.new
fi
done < /etc/apt/sources.list
mv /etc/apt/sources.list.new /etc/apt/sources.list
fi
if [[ -n "${DIB_DISTRIBUTION_MIRROR_UBUNTU_INSECURE:-}" ]]; then if [[ -n "${DIB_DISTRIBUTION_MIRROR_UBUNTU_INSECURE:-}" ]]; then
echo "APT::Get::AllowUnauthenticated \"true\";" | tee /etc/apt/apt.conf.d/95allow-unauthenticated echo "APT::Get::AllowUnauthenticated \"true\";" | tee /etc/apt/apt.conf.d/95allow-unauthenticated
echo "Acquire::AllowInsecureRepositories \"true\";" | tee -a /etc/apt/apt.conf.d/95allow-unauthenticated echo "Acquire::AllowInsecureRepositories \"true\";" | tee -a /etc/apt/apt.conf.d/95allow-unauthenticated
fi fi
mv /etc/apt/sources.list.new /etc/apt/sources.list