openstack/diskimage-builder
Code Issues Proposed changes

fix: add Debian stable to the same package rule as trixie

Browse Source 
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 <cardoe@cardoe.com>
This commit is contained in:
Doug Goldstein
2025-12-20 10:08:58 -06:00
parent c1c0fe39fa
commit 46f62db50e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diskimage_builder/elements/base/pre-install.d/03-baseline-tools
View File

@@ -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
;;

2
diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init
View File

@@ -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