diff options
| author | Robert Schweikert <rjschwei@suse.com> | 2016-10-29 09:29:53 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-11-01 08:48:17 -0400 |
| commit | 3416e2ee7f65defdb15aab861a85767d13e8c34c (patch) | |
| tree | a2966d6e7ae6bad53482c7c9fa241884c708ea5a | |
| parent | 4f8ceffb2e3a9feefcb718bda7a7f0f21ef7ab7c (diff) | |
| download | vyos-cloud-init-3416e2ee7f65defdb15aab861a85767d13e8c34c.tar.gz vyos-cloud-init-3416e2ee7f65defdb15aab861a85767d13e8c34c.zip | |
dmidecode: Allow dmidecode to be used on aarch64
aarch64 systems have functional dmidecode, so allow that to be used.
- aarch64 has support for dmidecode as well
| -rw-r--r-- | cloudinit/util.py | 3 | ||||
| -rw-r--r-- | tests/unittests/test_util.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index 4b3fd0cb..9a3d3cd7 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -2342,7 +2342,8 @@ def read_dmi_data(key): # running dmidecode can be problematic on some arches (LP: #1243287) uname_arch = os.uname()[4] if not (uname_arch == "x86_64" or - (uname_arch.startswith("i") and uname_arch[2:] == "86")): + (uname_arch.startswith("i") and uname_arch[2:] == "86") or + uname_arch == 'aarch64'): LOG.debug("dmidata is not supported on %s", uname_arch) return None diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py index 881509aa..f6a8ab75 100644 --- a/tests/unittests/test_util.py +++ b/tests/unittests/test_util.py @@ -386,7 +386,7 @@ class TestReadDMIData(helpers.FilesystemMockingTestCase): 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 |