diff options
| author | Scott Moser <smoser@brickies.net> | 2017-02-09 12:25:54 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-02-09 13:17:01 -0500 |
| commit | 7f85a3a5b4586ac7f21309aac4edc39e6ffea9ef (patch) | |
| tree | 35f0b589a650b6a64fb4e64defb6593cb2410043 | |
| parent | 3bcb72c593f13915a81272778809dd8e71e2c7b7 (diff) | |
| download | vyos-cloud-init-7f85a3a5b4586ac7f21309aac4edc39e6ffea9ef.tar.gz vyos-cloud-init-7f85a3a5b4586ac7f21309aac4edc39e6ffea9ef.zip | |
ds-identify: change aarch64 to use the default for non-dmi systems.
aarch64 does support dmi, but OpenStack does not populate guests
with this information, and there are currently bugs in qemu preventing
it from working correctly see bug #1663304 for more information.
So, for the time being, pretend as if there is no dmi data on aarch64,
which will make it enable cloud-init even when no datasources are found.
| -rwxr-xr-x | tools/ds-identify | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/ds-identify b/tools/ds-identify index 203eac0d..f07866a2 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -824,7 +824,9 @@ parse_policy() { local def="" case "$DI_UNAME_MACHINE" in # these have dmi data - i?86|x86_64|aarch64) def=${DI_DEFAULT_POLICY};; + i?86|x86_64) def=${DI_DEFAULT_POLICY};; + # aarch64 has dmi, but not currently used (LP: #1663304) + aarch64) def=${DI_DEFAULT_POLICY_NO_DMI};; *) def=${DI_DEFAULT_POLICY_NO_DMI};; esac local policy="$1" |