From 46f62db50eda52fa1b25858f38ee527418ff5251 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Sat, 20 Dec 2025 10:08:58 -0600 Subject: [PATCH] fix: add Debian stable to the same package rule as trixie Debian stable has been trixie since August 2025 so we need to skip attempting to install software-properties-common for stable. Change-Id: I4bd3c5085044d354b6c1354d56ed346da6da87be Signed-off-by: Doug Goldstein --- diskimage_builder/elements/base/pre-install.d/03-baseline-tools | 2 +- .../elements/cloud-init/post-install.d/20-enable-cloud-init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/diskimage_builder/elements/base/pre-install.d/03-baseline-tools b/diskimage_builder/elements/base/pre-install.d/03-baseline-tools index 8dac83ed8..a34c48ae1 100755 --- a/diskimage_builder/elements/base/pre-install.d/03-baseline-tools +++ b/diskimage_builder/elements/base/pre-install.d/03-baseline-tools @@ -13,7 +13,7 @@ case $DISTRO_NAME in # need something like it, create a wrapper in dpkg/bin and fedora/bin. apt-get -y update install-packages apt-transport-https - if ! [[ $DIB_RELEASE =~ ^(testing|trixie|unstable) ]]; then + if ! [[ $DIB_RELEASE =~ ^(testing|trixie|unstable|stable) ]]; then install-packages software-properties-common fi ;; diff --git a/diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init b/diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init index f943b880b..394635892 100755 --- a/diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init +++ b/diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init @@ -18,7 +18,7 @@ if [[ "${DIB_INIT_SYSTEM}" == "systemd" ]]; then systemctl enable cloud-config.service systemctl enable cloud-final.service systemctl enable cloud-init-local.service - if ! [[ $DIB_RELEASE =~ ^(testing|trixie|unstable) ]]; then + if ! [[ $DIB_RELEASE =~ ^(testing|trixie|unstable|stable) ]]; then systemctl enable cloud-init.service else systemctl enable cloud-init-main.service