diff options
| author | Chad Smith <chad.smith@canonical.com> | 2018-03-28 12:29:04 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-03-28 12:29:04 -0600 |
| commit | 005a08d4bda883deaa214126ca631c5aa6e98d1e (patch) | |
| tree | 40733abf4f7891c75564cb9dd04a95aa660719a9 | |
| parent | cf3eaed2e01062f9b5d47042d7a76b092970e0cf (diff) | |
| download | vyos-cloud-init-005a08d4bda883deaa214126ca631c5aa6e98d1e.tar.gz vyos-cloud-init-005a08d4bda883deaa214126ca631c5aa6e98d1e.zip | |
refresh patches
refresh the following against upstream 18.2:
debian/patches/azure-use-walinux-agent.patch
debian/patches/ds-identify-behavior-xenial.patch
| -rw-r--r-- | debian/patches/azure-use-walinux-agent.patch | 2 | ||||
| -rw-r--r-- | debian/patches/ds-identify-behavior-xenial.patch | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/azure-use-walinux-agent.patch b/debian/patches/azure-use-walinux-agent.patch index 7eca3362..2113b75d 100644 --- a/debian/patches/azure-use-walinux-agent.patch +++ b/debian/patches/azure-use-walinux-agent.patch @@ -6,7 +6,7 @@ Forwarded: not-needed Author: Scott Moser <smoser@ubuntu.com> --- a/cloudinit/sources/DataSourceAzure.py +++ b/cloudinit/sources/DataSourceAzure.py -@@ -191,7 +191,7 @@ if util.is_FreeBSD(): +@@ -190,7 +190,7 @@ if util.is_FreeBSD(): LOG.debug("resource disk is None") BUILTIN_DS_CONFIG = { diff --git a/debian/patches/ds-identify-behavior-xenial.patch b/debian/patches/ds-identify-behavior-xenial.patch index 5461ccc8..0bcfb372 100644 --- a/debian/patches/ds-identify-behavior-xenial.patch +++ b/debian/patches/ds-identify-behavior-xenial.patch @@ -21,12 +21,12 @@ Bug-ubuntu: http://bugs.launchpad.net/bugs/1660385 DI_DMI_CHASSIS_ASSET_TAG="" DI_DMI_PRODUCT_NAME="" DI_DMI_SYS_VENDOR="" -@@ -121,7 +121,7 @@ DI_ON_FOUND="" +@@ -122,7 +122,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:" "$@"; + _IS_IBM_CLOUD="" + |