diff options
| author | Scott Moser <smoser@brickies.net> | 2017-03-02 23:19:45 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-03-03 01:30:15 -0500 |
| commit | c81ea53bbdc4ada9d2b52430e106aeb3c38b4e0a (patch) | |
| tree | 4cc9f9f0e4d4740efe7ee55835ee23f0ec5ab6e7 /tools/ds-identify | |
| parent | d914ed8e573d464c4d21aa41069beb73fd3ce9be (diff) | |
| download | vyos-cloud-init-c81ea53bbdc4ada9d2b52430e106aeb3c38b4e0a.tar.gz vyos-cloud-init-c81ea53bbdc4ada9d2b52430e106aeb3c38b4e0a.zip | |
ds-identify: move default setting for Ec2/strict_id to a global.
Rather than having the dscheck_Ec2 just know the setting, move
it up to a more formal declaration. This will make it look more
clean when a distro carries a patch to change it to warn.
Diffstat (limited to 'tools/ds-identify')
| -rwxr-xr-x | tools/ds-identify | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/ds-identify b/tools/ds-identify index 741cf3ae..d7b2a0b2 100755 --- a/tools/ds-identify +++ b/tools/ds-identify @@ -109,6 +109,7 @@ DI_ON_FOUND="" DI_ON_MAYBE="" DI_ON_NOTFOUND="" +DI_EC2_STRICT_ID_DEFAULT="true" error() { set -- "ERROR:" "$@"; @@ -721,7 +722,7 @@ dscheck_Ec2() { return $DS_FOUND fi - local default="true" + local default="${DI_EC2_STRICT_ID_DEFAULT}" if ec2_read_strict_setting "$default"; then strict="$_RET" else |