diff options
| author | Scott Moser <smoser@brickies.net> | 2019-09-11 21:09:34 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2019-09-11 21:09:34 +0000 |
| commit | e7f16e215ef4fd6a31ddd2f1b585bbb6508bff06 (patch) | |
| tree | ba9a0e07a3ac8ca996c8071b77dec2fd64ec738c /tools/ds-identify | |
| parent | 45426d8d38a7224962867ba71f390cce653e0d17 (diff) | |
| download | vyos-cloud-init-e7f16e215ef4fd6a31ddd2f1b585bbb6508bff06.tar.gz vyos-cloud-init-e7f16e215ef4fd6a31ddd2f1b585bbb6508bff06.zip | |
Brightbox: restrict detection to require full domain match .brightbox.com
The detection for brightbox in both ds-identify and in
identify_brightbox would incorrectly match the domain 'bobrightbox',
which is not a brightbox platform. The fix here is to restrict
matching to '*.brightbox.com' rather than '*brightbox.com'
Also, while here remove a url to bug 1661693 which added the
knowledge of brightbox.
Diffstat (limited to 'tools/ds-identify')
| -rwxr-xr-x | tools/ds-identify | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/ds-identify b/tools/ds-identify index e0d4865c..2447d14f 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -891,9 +891,8 @@ ec2_identify_platform() { local default="$1" local serial="${DI_DMI_PRODUCT_SERIAL}" - # brightbox https://bugs.launchpad.net/cloud-init/+bug/1661693 case "$serial" in - *brightbox.com) _RET="Brightbox"; return 0;; + *.brightbox.com) _RET="Brightbox"; return 0;; esac # AWS http://docs.aws.amazon.com/AWSEC2/ |