diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-02-26 14:21:40 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-02-26 14:21:40 -0500 |
| commit | 0fa8bfa1104b18aaed8afb720cf0fa8ad8b3ffa2 (patch) | |
| tree | ee75ee5a646c106f7496321df6cd6162b02d4e53 /cloudinit | |
| parent | 5acc36948efd4d1dc3d6d33bf2fb67ac4ac80ef6 (diff) | |
| download | vyos-cloud-init-0fa8bfa1104b18aaed8afb720cf0fa8ad8b3ffa2.tar.gz vyos-cloud-init-0fa8bfa1104b18aaed8afb720cf0fa8ad8b3ffa2.zip | |
SmartOS: do not run on arm as dmidecode causes problems
See LP: #1243287 for more information, but the easiest thing to do
here is just not run smartos on arm.
LP: #1243287
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/sources/DataSourceSmartOS.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cloudinit/sources/DataSourceSmartOS.py b/cloudinit/sources/DataSourceSmartOS.py index 8d4a16e6..3c30541c 100644 --- a/cloudinit/sources/DataSourceSmartOS.py +++ b/cloudinit/sources/DataSourceSmartOS.py @@ -174,6 +174,12 @@ class DataSourceSmartOS(sources.DataSource): LOG.debug("Host does not appear to be on SmartOS") return False + uname_arch = os.uname()[4] + if uname_arch.startswith("arm") or uname_arch == "aarch64": + # Disabling because dmidcode in dmi_data() crashes kvm process + LOG.debug("Disabling SmartOS datasource on arm (LP: #1243287)") + return False + dmi_info = dmi_data() if dmi_info is False: LOG.debug("No dmidata utility found") |