diff options
| author | Scott Moser <smoser@brickies.net> | 2017-02-28 11:38:34 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-02-28 11:38:34 -0500 |
| commit | 4bb60d517da45919310265fa241e1e76b63e97bd (patch) | |
| tree | 9dbaa75391e6d09e6ada8202aff6ae4164f19e0f /tools | |
| parent | 05afe04edbe4c28f2170194d226821c1e755ee2d (diff) | |
| download | vyos-cloud-init-4bb60d517da45919310265fa241e1e76b63e97bd.tar.gz vyos-cloud-init-4bb60d517da45919310265fa241e1e76b63e97bd.zip | |
tools/ds-identify: look at cloud.cfg when looking for ec2 strict_id.
In the interest of speed I had skipped the parsing of
/etc/cloud/cloud.cfg for the ec2 strict_id setting. In hindsight
it seems reasonable for people to put settings there.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ds-identify | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/ds-identify b/tools/ds-identify index e618963b..9711a234 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -651,7 +651,7 @@ ec2_read_strict_setting() { # 3. look for the key 'strict_id' (datasource/Ec2/strict_id) local match="" bp="${PATH_CLOUD_CONFD}/cloud.cfg" - match="$bp.d/*[Ee][Cc]2*.cfg" + match="$bp $bp.d/*[Ee][Cc]2*.cfg" if check_config strict_id "$match"; then debug 2 "${_RET_fname} set strict_id to $_RET" return 0 |