Support Ubuntu 24.04 in nodepool elements

Extend all the tweaks that we have for Ubuntu 22.04 also apply to the
next LTS release.

Change-Id: Id62d39ba4b2af5f5ffd395b97a5187f5082bd4b0
This commit is contained in:
Dr. Jens Harbott 2024-04-17 11:17:42 +02:00 committed by Dr. Jens Harbott
parent e14c4fbf96
commit f0d909d7c3
3 changed files with 6 additions and 2 deletions

View File

@ -38,6 +38,10 @@
"jammy": {
"ntp": "",
"ntpdate": ""
},
"noble": {
"ntp": "",
"ntpdate": ""
}
}
},

View File

@ -13,7 +13,7 @@ case "$DIB_INIT_SYSTEM" in
;;
systemd)
# stick with default systemd timesyncd on bookworm, focal and beyond
if [[ ":bookworm: :focal: :jammy:" =~ :${DIB_RELEASE}: ]]; then
if [[ ":bookworm: :focal: :jammy: :noble:" =~ :${DIB_RELEASE}: ]]; then
exit 0
elif [[ $DISTRO_NAME = "ubuntu" || $DISTRO_NAME = "debian" ]]; then
systemctl enable ntp.service

View File

@ -23,7 +23,7 @@ set -o pipefail
# NOTE(frickler): Our images builds always install the newest updates,
# so we need this in order to avoid conflicts
if [ ${DIB_RELEASE} = jammy ]; then
if [[ ":jammy: :noble:" =~ :${DIB_RELEASE}: ]]; then
if [ -d "$TARGET_ROOT/etc/apt/apt.conf.d" ]; then
echo "APT::Get::Always-Include-Phased-Updates \"true\";" | sudo tee $TARGET_ROOT/etc/apt/apt.conf.d/95phased-updates
fi