Scott Moser has proposed merging ~smoser/cloud-init:ubuntu/xenial-refresh-ds-identify-patch into cloud-init:ubuntu/xenial.
Requested reviews: cloud-init commiters (cloud-init-dev) For more details, see: https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/335100 -- Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:ubuntu/xenial-refresh-ds-identify-patch into cloud-init:ubuntu/xenial.
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 <[email protected]> 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=""
_______________________________________________ Mailing list: https://launchpad.net/~cloud-init-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp
