From 74d78b55115b50fe7ba7321d6ffbac441d7eb6c5 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Wed, 28 Jun 2017 12:58:16 -0400
Subject: cherry pick 1cd4323b
---
...azure-remove-accidental-duplicate-line-in-merge | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 23 insertions(+)
create mode 100644 debian/patches/cpick-1cd4323b-azure-remove-accidental-duplicate-line-in-merge
(limited to 'debian')
diff --git a/debian/patches/cpick-1cd4323b-azure-remove-accidental-duplicate-line-in-merge b/debian/patches/cpick-1cd4323b-azure-remove-accidental-duplicate-line-in-merge
new file mode 100644
index 00000000..2ddf83ee
--- /dev/null
+++ b/debian/patches/cpick-1cd4323b-azure-remove-accidental-duplicate-line-in-merge
@@ -0,0 +1,22 @@
+From 1cd4323b940408aa34dcaa01bd8a7ed43d9a966a Mon Sep 17 00:00:00 2001
+From: Scott Moser <smoser@brickies.net>
+Date: Thu, 1 Jun 2017 12:40:12 -0400
+Subject: [PATCH] azure: remove accidental duplicate line in merge.
+
+In previous commit I inadvertantly left two calls to
+ asset_tag = util.read_dmi_data('chassis-asset-tag')
+The second did not do anything useful. Thus, remove it.
+---
+ cloudinit/sources/DataSourceAzure.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/cloudinit/sources/DataSourceAzure.py
++++ b/cloudinit/sources/DataSourceAzure.py
+@@ -326,7 +326,6 @@ class DataSourceAzureNet(sources.DataSou
+ if asset_tag != AZURE_CHASSIS_ASSET_TAG:
+ LOG.debug("Non-Azure DMI asset tag '%s' discovered.", asset_tag)
+ return False
+- asset_tag = util.read_dmi_data('chassis-asset-tag')
+ ddir = self.ds_cfg['data_dir']
+
+ candidates = [self.seed_dir]
diff --git a/debian/patches/series b/debian/patches/series
index d2512471..6763818f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ azure-use-walinux-agent.patch
cpick-5fb49bac-azure-identify-platform-by-well-known-value-in-chassis
ds-identify-behavior-xenial.patch
cpick-003c6678-net-remove-systemd-link-file-writing-from-eni-renderer
+cpick-1cd4323b-azure-remove-accidental-duplicate-line-in-merge
--
cgit v1.2.3