From bf6ac0db939ae88ee1b48cdde887372aeab75b3f Mon Sep 17 00:00:00 2001
From: Shamil Mubarakshin
 <127750046+shamil-mubarakshin@users.noreply.github.com>
Date: Mon, 4 Nov 2024 15:28:58 +0100
Subject: [PATCH] [Ubuntu24] Update apt sources (#10804)

---
 .../ubuntu/scripts/build/configure-apt-sources.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/images/ubuntu/scripts/build/configure-apt-sources.sh b/images/ubuntu/scripts/build/configure-apt-sources.sh
index b5afda474..1e6c98220 100644
--- a/images/ubuntu/scripts/build/configure-apt-sources.sh
+++ b/images/ubuntu/scripts/build/configure-apt-sources.sh
@@ -4,13 +4,22 @@
 ##  Desc:  Configure apt sources with failover from Azure to Ubuntu archives.
 ################################################################################
 
+source $HELPER_SCRIPTS/os.sh
+
 touch /etc/apt/apt-mirrors.txt
 
 printf "http://azure.archive.ubuntu.com/ubuntu/\tpriority:1\n" | tee -a /etc/apt/apt-mirrors.txt
 printf "http://archive.ubuntu.com/ubuntu/\tpriority:2\n" | tee -a /etc/apt/apt-mirrors.txt
 printf "http://security.ubuntu.com/ubuntu/\tpriority:3\n" | tee -a /etc/apt/apt-mirrors.txt
 
-sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list
+if is_ubuntu24; then
+    sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list.d/ubuntu.sources
 
-# Apt changes to survive Cloud Init
-cp -f /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl
+    # Apt changes to survive Cloud Init
+    cp -f /etc/apt/sources.list.d/ubuntu.sources  /etc/cloud/templates/sources.list.ubuntu.deb822.tmpl
+else
+    sed -i 's/http:\/\/azure.archive.ubuntu.com\/ubuntu\//mirror+file:\/etc\/apt\/apt-mirrors.txt/' /etc/apt/sources.list
+
+    # Apt changes to survive Cloud Init
+    cp -f /etc/apt/sources.list /etc/cloud/templates/sources.list.ubuntu.tmpl
+fi