1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
Description: Adjust behavior of ds-identify for SRU
To make this acceptable as a SRU we have changed ds-identify to
act in 'report only' mode, and to only 'warn' when it cloud-init
finds itself to be using a Ec2 Datasource on an unknown and
non AWS platform.
Forwarded: not-needed
Author: Scott Moser <smoser@ubuntu.com>
Bug-ubuntu: http://bugs.launchpad.net/bugs/1669675
Bug-ubuntu: http://bugs.launchpad.net/bugs/1660385
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -81,8 +81,8 @@ _DI_LOGGED=""
# set DI_MAIN='noop' in environment to source this file with no main called.
DI_MAIN=${DI_MAIN:-main}
-DI_DEFAULT_POLICY="search,found=all,maybe=all,notfound=${DI_DISABLED}"
-DI_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=all,notfound=${DI_ENABLED}"
+DI_DEFAULT_POLICY="report,found=all,maybe=all,notfound=${DI_ENABLED}"
+DI_DEFAULT_POLICY_NO_DMI="report,found=all,maybe=all,notfound=${DI_ENABLED}"
DI_DMI_PRODUCT_NAME=""
DI_DMI_SYS_VENDOR=""
DI_DMI_PRODUCT_SERIAL=""
@@ -115,7 +115,7 @@ DI_ON_FOUND=""
DI_ON_MAYBE=""
DI_ON_NOTFOUND=""
-DI_EC2_STRICT_ID_DEFAULT="true"
+DI_EC2_STRICT_ID_DEFAULT="warn"
error() {
set -- "ERROR:" "$@";
|
