diff options
| author | zsdc <taras@vyos.io> | 2020-03-11 21:20:58 +0200 |
|---|---|---|
| committer | zsdc <taras@vyos.io> | 2020-03-11 21:22:23 +0200 |
| commit | c6627bc05a57645e6af8b9a5a67e452d9f37e487 (patch) | |
| tree | b754b3991e5e57a9ae9155819f73fa0cbd4be269 /debian/patches/ds-identify-behavior-xenial.patch | |
| parent | ca9a4eb26b41c204d1bd3a15586b14a5dde950bb (diff) | |
| parent | 13e82554728b1cb524438163784e5b955c7c5ed0 (diff) | |
| download | vyos-cloud-init-c6627bc05a57645e6af8b9a5a67e452d9f37e487.tar.gz vyos-cloud-init-c6627bc05a57645e6af8b9a5a67e452d9f37e487.zip | |
Cloud-init: T2117: Updated to 20.1
- Merge 20.1 version from the Canonical repository
- Removed unneeded changes in datasources (now only OVF datasource is not equal to upstream's version)
- Adapted cc_vyos module to new Cloud-init version
- Changed Jenkinsfile to use build scripts, provided by upstream
Diffstat (limited to 'debian/patches/ds-identify-behavior-xenial.patch')
| -rw-r--r-- | debian/patches/ds-identify-behavior-xenial.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/debian/patches/ds-identify-behavior-xenial.patch b/debian/patches/ds-identify-behavior-xenial.patch deleted file mode 100644 index ba7639ab..00000000 --- a/debian/patches/ds-identify-behavior-xenial.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 -@@ -93,8 +93,8 @@ _DI_LOGGED="" - DI_MAIN=${DI_MAIN:-main} - - DI_BLKID_OUTPUT="" --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_CHASSIS_ASSET_TAG="" - DI_DMI_PRODUCT_NAME="" - DI_DMI_SYS_VENDOR="" -@@ -131,7 +131,7 @@ DI_ON_FOUND="" - DI_ON_MAYBE="" - DI_ON_NOTFOUND="" - --DI_EC2_STRICT_ID_DEFAULT="true" -+DI_EC2_STRICT_ID_DEFAULT="warn" - - _IS_IBM_CLOUD="" - |