MT#59425 ec2-create-ce: no longer rewrite /etc/apt/sources.list

Usage of deb.debian.org for our EC2 instances was introduced in commit
b05a298 back in 2017, when cdn-aws.deb.debian.org often failed with 503
http errors. This is no longer true, and cdn-aws.deb.debian.org seems to
work reliable.

Furthermore, nowadays the Debian bookworm AMIs use the deb822 format:

| $ cat /etc/apt/sources.list.d/debian.sources
| Types: deb deb-src
| URIs: mirror+file:///etc/apt/mirrors/debian.list
| Suites: bookworm bookworm-updates bookworm-backports
| Components: main
|
| Types: deb deb-src
| URIs: mirror+file:///etc/apt/mirrors/debian-security.list
| Suites: bookworm-security
| Components: main
|
| $ cat /etc/apt/mirrors/debian.list
| https://cdn-aws.deb.debian.org/debian
|
| $ cat /etc/apt/mirrors/debian-security.list
| https://cdn-aws.deb.debian.org/debian-security
|
| $ cat /etc/apt/sources.list
| # See /etc/apt/sources.list.d/debian.sources

Given that /etc/apt/sources.list consists only of comments and that
cdn-aws.deb.debian.org works as expected, let's drop this NOOP command.

Change-Id: If56d9d2a030db52e805286a0115f6e6e561ac6bf
master
Michael Prokop 1 year ago
parent 92fc5eb2d8
commit 4174b340db

@ -447,7 +447,6 @@ cat > "${USER_DATA_FILE}" << EOF
#!/bin/bash
wget -O /tmp/ngcp-installer.deb ${INSTALLER_URL}
dpkg -i /tmp/ngcp-installer.deb
sed -i 's/cdn-aws.deb.debian.org/deb.debian.org/' /etc/apt/sources.list
if [ -f /etc/apt/sources.list.d/backports.list ] && grep -q 'jessie-backports' /etc/apt/sources.list.d/backports.list ; then
echo "jessie-backports no longer exists, removing /etc/apt/sources.list.d/backports.list"

Loading…
Cancel
Save