From 2f12ac28aafd8f3d0b750711c2b72361c62b4a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 12 Apr 2024 21:55:57 +0200 Subject: [PATCH] Sync from SUSE:ALP:Source:Standard:1.0 cloud-init revision ef1c2f663d427ccc3e9fb8331515b755 --- cloud-init-no-openstack-guess.patch | 9 +++++++++ cloud-init.changes | 8 ++++++++ 2 files changed, 17 insertions(+) diff --git a/cloud-init-no-openstack-guess.patch b/cloud-init-no-openstack-guess.patch index 1adb5b8..6f472a0 100644 --- a/cloud-init-no-openstack-guess.patch +++ b/cloud-init-no-openstack-guess.patch @@ -1,5 +1,14 @@ --- tools/ds-identify.orig +++ tools/ds-identify +@@ -95,7 +95,7 @@ DI_MAIN=${DI_MAIN:-main} + DI_BLKID_EXPORT_OUT="" + DI_GEOM_LABEL_STATUS_OUT="" + DI_DEFAULT_POLICY="search,found=all,maybe=all,notfound=${DI_DISABLED}" +-DI_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=all,notfound=${DI_ENABLED}" ++DI_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=all,notfound=${DI_DISABLED}" + DI_DMI_BOARD_NAME="" + DI_DMI_CHASSIS_ASSET_TAG="" + DI_DMI_PRODUCT_NAME="" @@ -1261,12 +1261,6 @@ dscheck_OpenStack() { return ${DS_FOUND} fi diff --git a/cloud-init.changes b/cloud-init.changes index eab8927..9bd6343 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Apr 9 16:00:13 UTC 2024 - Robert Schweikert + +- Update cloud-init-no-openstack-guess.patch + + Do not enable cloud-init on systems where there is no DMI just + because no data source has been found. No data source means + cloud-init will not run. + ------------------------------------------------------------------- Fri Apr 5 18:01:39 UTC 2024 - Robert Schweikert