diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-12 17:05:04 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-12 17:05:04 -0400 |
| commit | bf1728902bd3e81e00aa9786a5b1c67e4f30a659 (patch) | |
| tree | 857c914003fda2ec5223425a31b646cbafd9907b /cloudinit/util.py | |
| parent | e28ba310872846e0bc60595aed353c17b760fdcb (diff) | |
| parent | bc2c3267549b9067c017a34e22bbee18890aec06 (diff) | |
| download | vyos-cloud-init-bf1728902bd3e81e00aa9786a5b1c67e4f30a659.tar.gz vyos-cloud-init-bf1728902bd3e81e00aa9786a5b1c67e4f30a659.zip | |
Merge branch 'master' into ubuntu/devel
Diffstat (limited to 'cloudinit/util.py')
| -rw-r--r-- | cloudinit/util.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index e5dd61a0..226628cc 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -2227,10 +2227,17 @@ def read_dmi_data(key): If all of the above fail to find a value, None will be returned. """ + syspath_value = _read_dmi_syspath(key) if syspath_value is not None: return syspath_value + # running dmidecode can be problematic on some arches (LP: #1243287) + uname_arch = os.uname()[4] + if uname_arch.startswith("arm") or uname_arch == "aarch64": + LOG.debug("dmidata is not supported on %s", uname_arch) + return None + dmidecode_path = which('dmidecode') if dmidecode_path: return _call_dmidecode(key, dmidecode_path) |