Robert Schweikert
b3d3a8bcbd
+ Forward port
- cloud-init-no-openstack-guess.patch
+ docs: provide example3 for PAM and ssh_pwauth behavior (#27)
+ fix: Make hotplug socket writable only by root (#25) (CVE-2024-11584)
+ fix: Don't attempt to identify non-x86 OpenStack instances (LP: #2069607)
(CVE-2024-6174)
From 25.1.2
+ fix: ensure MAAS datasource retries on failure (#6167)
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=247
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
--- tests/unittests/test_ds_identify.py.orig
|
|
+++ tests/unittests/test_ds_identify.py
|
|
@@ -951,7 +951,7 @@ class TestDsIdentify(DsIdentifyBase):
|
|
|
|
nova does not identify itself on platforms other than intel.
|
|
https://bugs.launchpad.net/cloud-init/+bugs?field.tag=dsid-nova"""
|
|
-
|
|
+ return
|
|
data = copy.deepcopy(VALID_CFG["OpenStack"])
|
|
del data["files"][P_PRODUCT_NAME]
|
|
data.update(
|
|
--- tools/ds-identify.orig
|
|
+++ tools/ds-identify
|
|
@@ -101,7 +101,7 @@ DI_MAIN=${DI_MAIN:-main}
|
|
DI_BLKID_EXPORT_OUT=""
|
|
DI_GEOM_LABEL_STATUS_OUT=""
|
|
DI_DEFAULT_POLICY="search,found=all,maybe=none,notfound=${DI_DISABLED}"
|
|
-DI_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=none,notfound=${DI_ENABLED}"
|
|
+DI_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=none,notfound=${DI_DISABLED}"
|
|
DI_DMI_BOARD_NAME=""
|
|
DI_DMI_CHASSIS_ASSET_TAG=""
|
|
DI_DMI_PRODUCT_NAME=""
|
|
@@ -1474,11 +1474,6 @@ dscheck_OpenStack() {
|
|
return ${DS_FOUND}
|
|
fi
|
|
|
|
- # LP: #1715241 : arch other than intel are not identified properly.
|
|
- case "$DI_UNAME_MACHINE" in
|
|
- i?86|x86_64) :;;
|
|
- *) return ${DS_MAYBE};;
|
|
- esac
|
|
|
|
return ${DS_NOT_FOUND}
|
|
}
|