2016-09-13 18:56:10 +02:00
|
|
|
--- cloudinit/util.py.orig
|
|
|
|
|
+++ cloudinit/util.py
|
|
|
|
|
@@ -2337,7 +2337,7 @@ def read_dmi_data(key):
|
2014-08-11 17:58:55 +02:00
|
|
|
|
2016-09-13 18:56:10 +02:00
|
|
|
# running dmidecode can be problematic on some arches (LP: #1243287)
|
|
|
|
|
uname_arch = os.uname()[4]
|
|
|
|
|
- if uname_arch.startswith("arm") or uname_arch == "aarch64":
|
2016-10-29 15:26:03 +02:00
|
|
|
+ if uname_arch.startswith("arm") or uname_arch.startswith("ppc"):
|
2016-09-13 18:56:10 +02:00
|
|
|
LOG.debug("dmidata is not supported on %s", uname_arch)
|
|
|
|
|
return None
|
2014-08-11 17:58:55 +02:00
|
|
|
|
2016-10-29 17:30:42 +02:00
|
|
|
--- tests/unittests/test_util.py.orig
|
|
|
|
|
+++ tests/unittests/test_util.py
|
|
|
|
|
@@ -384,7 +384,7 @@ class TestReadDMIData(helpers.Filesystem
|
|
|
|
|
dmi_name = 'use-dmidecode'
|
|
|
|
|
self._configure_dmidecode_return(dmi_name, dmi_val)
|
|
|
|
|
|
|
|
|
|
- expected = {'armel': None, 'aarch64': None, 'x86_64': dmi_val}
|
|
|
|
|
+ expected = {'armel': None, 'aarch64': dmi_val, 'x86_64': dmi_val}
|
|
|
|
|
found = {}
|
|
|
|
|
# we do not run the 'dmi-decode' binary on some arches
|
|
|
|
|
# verify that anything requested that is not in the sysfs dir
|
