diff options
| author | Scott Moser <smoser@ubuntu.com> | 2017-12-12 14:24:32 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2017-12-12 14:28:55 -0500 |
| commit | f45559a3030cde324aaf84b8053927b74edcf067 (patch) | |
| tree | d10f6869fc741ee79a82b217cb32eb326a250d58 /debian | |
| parent | 604b2366ded1d46ec57077a30a1be1f1e56b9541 (diff) | |
| download | vyos-cloud-init-f45559a3030cde324aaf84b8053927b74edcf067.tar.gz vyos-cloud-init-f45559a3030cde324aaf84b8053927b74edcf067.zip | |
debian/patches/ds-identify-behavior-xenial.patch: refresh patch
upstream changes to ds-identify made this not apply cleanly.
Simply refresh against a30a3bb5bae.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches/ds-identify-behavior-xenial.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/patches/ds-identify-behavior-xenial.patch b/debian/patches/ds-identify-behavior-xenial.patch index cfe8f9a8..5461ccc8 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="" |