diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-02-27 10:51:22 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-02-27 10:51:22 -0500 |
| commit | 53794c0cf2cf66868f5bf528883edaa375793dcf (patch) | |
| tree | ac88db4e000e1e5c9605a1492f330e33a6b3ac86 /cloudinit | |
| parent | 21fc25fbc0e73e15710d2f0333f7d3ba13eb3739 (diff) | |
| parent | 516bba11344c7c22aa23e09793a6cdf53faebf01 (diff) | |
| download | vyos-cloud-init-53794c0cf2cf66868f5bf528883edaa375793dcf.tar.gz vyos-cloud-init-53794c0cf2cf66868f5bf528883edaa375793dcf.zip | |
AltCloud: to not run dmidecode on arm systems.
As with SmartOS change earlier, running dmidecode on arm will crash kvm.
So instead of doing that, just return UNKNOWN which will cause this
data source to not activate.
LP: #1285686
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/sources/DataSourceAltCloud.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cloudinit/sources/DataSourceAltCloud.py b/cloudinit/sources/DataSourceAltCloud.py index a834f8eb..1e913a6e 100644 --- a/cloudinit/sources/DataSourceAltCloud.py +++ b/cloudinit/sources/DataSourceAltCloud.py @@ -115,6 +115,12 @@ class DataSourceAltCloud(sources.DataSource): ''' + uname_arch = os.uname()[4] + if uname_arch.startswith("arm") or uname_arch == "aarch64": + # Disabling because dmidecode in CMD_DMI_SYSTEM crashes kvm process + LOG.debug("Disabling AltCloud datasource on arm (LP: #1243287)") + return 'UNKNOWN' + cmd = CMD_DMI_SYSTEM try: (cmd_out, _err) = util.subp(cmd) |