summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2017-06-02 16:28:55 -0400
committerScott Moser <smoser@brickies.net>2017-06-02 16:28:55 -0400
commite1c6c605f4bddda14cf766e74d369d03275b3e10 (patch)
tree6ae48df22c1d62f2955f1a256a0c2678cb6d6290
parentcc2cd0123a41be8315d44c287a2d7d5496db1dd4 (diff)
downloadcloud-init-git-e1c6c605f4bddda14cf766e74d369d03275b3e10.tar.gz
debian/patches/ds-identify-behavior-yakkety.patch: refresh patch
upstream changes to ds-identify made this not apply cleanly. Simply refresh against 5fb49bacf74.
-rw-r--r--debian/patches/ds-identify-behavior-yakkety.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/ds-identify-behavior-yakkety.patch b/debian/patches/ds-identify-behavior-yakkety.patch
index bc56477f..16780b67 100644
--- a/debian/patches/ds-identify-behavior-yakkety.patch
+++ b/debian/patches/ds-identify-behavior-yakkety.patch
@@ -10,16 +10,16 @@ Bug-ubuntu: http://bugs.launchpad.net/bugs/1660385
--- a/tools/ds-identify
+++ b/tools/ds-identify
-@@ -74,7 +74,7 @@ _DI_LOGGED=""
+@@ -83,7 +83,7 @@ _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="search,found=all,maybe=all,notfound=${DI_ENABLED}"
DI_DEFAULT_POLICY_NO_DMI="search,found=all,maybe=all,notfound=${DI_ENABLED}"
+ DI_DMI_CHASSIS_ASSET_TAG=""
DI_DMI_PRODUCT_NAME=""
- DI_DMI_SYS_VENDOR=""
-@@ -109,7 +109,7 @@ DI_ON_FOUND=""
+@@ -119,7 +119,7 @@ DI_ON_FOUND=""
DI_ON_MAYBE=""
DI_ON_NOTFOUND=""