diff options
| author | Scott Moser <smoser@brickies.net> | 2017-12-12 11:41:26 -0700 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2017-12-12 11:41:26 -0700 |
| commit | a30a3bb5baec4da1d8f91385849e9b5b826678bf (patch) | |
| tree | 97de1d1ee870bda999f6fd44b71d97c5252e73af /tools/ds-identify | |
| parent | b63ee73da874de68ff2019570e12df2a39d4626b (diff) | |
| download | vyos-cloud-init-a30a3bb5baec4da1d8f91385849e9b5b826678bf.tar.gz vyos-cloud-init-a30a3bb5baec4da1d8f91385849e9b5b826678bf.zip | |
ds-identify: failure in NoCloud due to unset variable usage.
The previous OVF datasource change added a debug message that referenced
an un-used variable. The failure path would be triggered if an image was
booted with a iso9660 filesystem attached to a device that was not a
cdrom.
A unit test is added for the specific failure found.
Additional safety to avoid 'cidata' labels is also added to the OVF
checker.
LP: #1737704
Diffstat (limited to 'tools/ds-identify')
| -rwxr-xr-x | tools/ds-identify | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/ds-identify b/tools/ds-identify index 4c59d7bc..5893a761 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -657,7 +657,7 @@ is_cdrom_ovf() { # skip devices that don't look like cdrom paths. case "$dev" in /dev/sr[0-9]|/dev/hd[a-z]) :;; - *) debug 1 "skipping iso dev $d" + *) debug 1 "skipping iso dev $dev" return 1;; esac @@ -666,7 +666,7 @@ is_cdrom_ovf() { # explicitly skip known labels of other types. rd_rdfe is azure. case "$label" in - config-2|rd_rdfe_stable*) return 1;; + config-2|rd_rdfe_stable*|cidata) return 1;; esac local idstr="http://schemas.dmtf.org/ovf/environment/1" |