diff options
| author | Scott Moser <smoser@ubuntu.com> | 2018-01-25 12:51:03 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2018-01-26 16:26:52 -0500 |
| commit | 5e5dc9731f39e8b1df767fbaf850fbbd31355a1a (patch) | |
| tree | 90be369c38226f7f02d335969fc87ed9d83afd73 /tools | |
| parent | 1d8c327139a8c291eeb244ee1a6a8badd83e9e72 (diff) | |
| download | vyos-cloud-init-5e5dc9731f39e8b1df767fbaf850fbbd31355a1a.tar.gz vyos-cloud-init-5e5dc9731f39e8b1df767fbaf850fbbd31355a1a.zip | |
OVF: Extend well-known labels to include OVFENV.
Fujitsu Cloud Service attaches a ovf iso transport with a label
'OVFENV'. This seems to be a reasonable value as a label.
While the for bug 1731868 would likely fix cloud-init on fujitsu
cloud, this change will find it faster.
LP: #1698669
Diffstat (limited to 'tools')
| -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 374c3ad1..cd268242 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -664,7 +664,9 @@ is_cdrom_ovf() { esac # fast path known 'OVF' labels - [ "$label" = "OVF-TRANSPORT" -o "$label" = "ovf-transport" ] && return 0 + case "$label" in + OVF-TRANSPORT|ovf-transport|OVFENV|ovfenv) return 0;; + esac # explicitly skip known labels of other types. rd_rdfe is azure. case "$label" in |