summaryrefslogtreecommitdiff
path: root/cloudinit/util.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-09-20 13:58:52 -0400
committerScott Moser <smoser@brickies.net>2016-09-20 13:58:52 -0400
commit539ad73ee6c4a7d48e5ca4c58b329fcc0216f929 (patch)
tree955a9007cc7f62f2983aeb487959d3c7b061ca9f /cloudinit/util.py
parentb6c724db8ee7fcf5cd2f95aa3909d2108a8f3c10 (diff)
parent80f5ec4be0f781b26eca51d90d51abfab396b3f6 (diff)
downloadvyos-cloud-init-539ad73ee6c4a7d48e5ca4c58b329fcc0216f929.tar.gz
vyos-cloud-init-539ad73ee6c4a7d48e5ca4c58b329fcc0216f929.zip
merge from master at 0.7.8-3-g80f5ec4
Diffstat (limited to 'cloudinit/util.py')
-rw-r--r--cloudinit/util.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py
index 7c37eb8f..6c5cf741 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -2337,7 +2337,8 @@ def read_dmi_data(key):
# running dmidecode can be problematic on some arches (LP: #1243287)
uname_arch = os.uname()[4]
- if uname_arch.startswith("arm") or uname_arch == "aarch64":
+ if not (uname_arch == "x86_64" or
+ (uname_arch.startswith("i") and uname_arch[2:] == "86")):
LOG.debug("dmidata is not supported on %s", uname_arch)
return None