Merge ~smoser/cloud-init:ubuntu/xenial-refresh-ds-identify-patch into cloud-init:ubuntu/xenial

[Scott Moser]

debian/patches/ds-identify-behavior-xenial.patch: refresh patch

upstream changes to ds-identify made this not apply cleanly.
Simply refresh against a30a3bb5bae.

ds-identify changed, so the xenial patch that is applied no longer cleanly
applies.

This fixes daily build recipe failures like:
 https://lists.launchpad.net/cloud-init-dev/msg03946.html

We can either do this now or later.
Benefit of doing it now:
 * daily build archive keeps building.

Benefit of doing it later:
 * possibly saving a refresh (if we had another change before a new upstream
   snapshot).

[Ryan Harper (raharper)]

LGTM

review: Approve

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:d3bfec217243229f713584294955b5b3038c43a3
https://jenkins.ubuntu.com/server/job/cloud-init-ci/623/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    FAILED: Ubuntu LTS: Build

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/623/rebuild

review: Needs Fixing (continuous-integration)

diff --git a/debian/changelog b/debian/changelog
index b40a097..a2ea6e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cloud-init (17.1-46-g7acc9e68-0ubuntu1~16.04.2) UNRELEASED; urgency=medium
+
+  * debian/patches/ds-identify-behavior-xenial.patch: refresh patch.
+
+ -- Scott Moser <[e-mail]>  Tue, 12 Dec 2017 14:29:46 -0500
+
 cloud-init (17.1-46-g7acc9e68-0ubuntu1~16.04.1) xenial-proposed; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/patches/ds-identify-behavior-xenial.patch b/debian/patches/ds-identify-behavior-xenial.patch
index cfe8f9a..5461ccc 100644
--- a/debian/patches/ds-identify-behavior-xenial.patch
+++ b/debian/patches/ds-identify-behavior-xenial.patch
@@ -10,10 +10,10 @@ Bug-ubuntu: http://bugs.launchpad.net/bugs/1660385
 
 --- a/tools/ds-identify
 +++ b/tools/ds-identify
-@@ -83,8 +83,8 @@ _DI_LOGGED=""
- # set DI_MAIN='noop' in environment to source this file with no main called.
+@@ -84,8 +84,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}"
@@ -21,7 +21,7 @@ Bug-ubuntu: http://bugs.launchpad.net/bugs/1660385
  DI_DMI_CHASSIS_ASSET_TAG=""
  DI_DMI_PRODUCT_NAME=""
  DI_DMI_SYS_VENDOR=""
-@@ -119,7 +119,7 @@ DI_ON_FOUND=""
+@@ -121,7 +121,7 @@ DI_ON_FOUND=""
  DI_ON_MAYBE=""
  DI_ON_NOTFOUND=""