diff options
| -rw-r--r-- | debian/patches/ds-identify-behavior-xenial.patch | 32 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/debian/patches/ds-identify-behavior-xenial.patch b/debian/patches/ds-identify-behavior-xenial.patch new file mode 100644 index 00000000..7a6a8f1f --- /dev/null +++ b/debian/patches/ds-identify-behavior-xenial.patch @@ -0,0 +1,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 +@@ -74,8 +74,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,search,found=all,maybe=all,notfound=${DI_ENABLED}" ++DI_DEFAULT_POLICY_NO_DMI="report,search,found=all,maybe=all,notfound=${DI_ENABLED}" + DI_DMI_PRODUCT_NAME="" + DI_DMI_SYS_VENDOR="" + DI_DMI_PRODUCT_SERIAL="" +@@ -109,7 +109,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:" "$@"; diff --git a/debian/patches/series b/debian/patches/series index 8804449a..7669c82f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ azure-use-walinux-agent.patch +ds-identify-behavior-xenial.patch |