From c81ea53bbdc4ada9d2b52430e106aeb3c38b4e0a Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Thu, 2 Mar 2017 23:19:45 -0500
Subject: 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.
---
 tools/ds-identify | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools')

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
-- 
cgit v1.2.3