diff options
author | Scott Moser <smoser@ubuntu.com> | 2016-03-10 16:56:44 -0500 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2016-03-10 16:56:44 -0500 |
commit | 41470d29f5888baf7ec78e170cc0d6d981dcf63e (patch) | |
tree | fa9777e5efcaddd21d8c0127dcd617ef7e2fac0a /cloudinit/util.py | |
parent | 0865e5179f2a803f727e83b5e36681613e63fe8a (diff) | |
parent | be38478cd8e11b0e29c70bb881a676628e9f74d5 (diff) | |
download | vyos-cloud-init-41470d29f5888baf7ec78e170cc0d6d981dcf63e.tar.gz vyos-cloud-init-41470d29f5888baf7ec78e170cc0d6d981dcf63e.zip |
dmi data: fix failure of reading dmi data for unset dmi values
it is not uncommon to find dmi data in /sys full of 'ff'. utf-8
decoding of those would fail, causing warning and stacktrace.
Return '.' instead of \xff. This is what dmidecode would return.
$ dmidecode --string system-product-name
Diffstat (limited to 'cloudinit/util.py')
-rw-r--r-- | cloudinit/util.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index e7407ea4..01dc7751 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -2140,13 +2140,19 @@ def _read_dmi_syspath(key): LOG.debug("did not find %s", dmi_key_path) return None - key_data = load_file(dmi_key_path) + key_data = load_file(dmi_key_path, decode=False) if not key_data: LOG.debug("%s did not return any data", dmi_key_path) return None - LOG.debug("dmi data %s returned %s", dmi_key_path, key_data) - return key_data.strip() + # uninitialized dmi values show as all \xff and /sys appends a '\n'. + # in that event, return a string of '.' in the same length. + if key_data == b'\xff' * (len(key_data) - 1) + b'\n': + key_data = b'.' * (len(key_data) - 1) + b'\n' + + str_data = key_data.decode('utf8').strip() + LOG.debug("dmi data %s returned %s", dmi_key_path, str_data) + return str_data except Exception: logexc(LOG, "failed read of %s", dmi_key_path) |