--- cloud-init-0.7.7~bzr1155/debian/cloud-init.postinst	2015-11-05 09:59:04.000000000 -0700
+++ cloud-init-0.7.7~bzr1155.applied/debian/cloud-init.postinst	2015-11-17 12:35:04.877603098 -0700
@@ -193,6 +193,53 @@
 
 }
 
+apply_lp_1506187(){
+  # With LP: #1506187, the Azure instance ID detection method was changed
+  # to use the DMI data. In order to prevent existing instances from thinking
+  # they are new instances, the instance ID needs to be updated here.
+
+  if grep DataSourceAzure /var/lib/cloud/instance/datasource > /dev/null 2>&1; then
+     new_instance_id=$(cat /sys/devices/virtual/dmi/id/product_uuid)
+     old_instance_id=$(basename $(readlink -f /var/lib/cloud/instance))
+     echo "Azure instance ID is: ${new_instance_id}"
+
+     if [ -z "${new_instance_id}" -o -z "${old_instance_id}" ]; then
+        cat <<EOM
+WARNING: Failed to migrate old instance ID to new instance ID.
+    Cloud-init may detect this instance as a new instance upon reboot.
+    Please see: https://bugs.launchpad.net/bug/1506187
+EOM
+
+     elif [ "${new_instance_id}" != "${old_instance_id}" ]; then
+        cat <<EOM
+AZURE: this instance uses the old instance ID.
+    The instance ID will be changed from:
+            ${old_instance_id}
+        to:
+            ${new_instance_id}
+    Please see https://bugs.launchpad.net/bug/1506187 and
+    https://azure.microsoft.com/en-us/blog/accessing-and-using-azure-vm-unique-id/
+    for more information about this change
+EOM
+        # Remove the symlink for the instance
+        rm /var/lib/cloud/instance
+
+        # Rename the old instance id to the new one
+        mv /var/lib/cloud/instances/${old_instance_id} \
+           /var/lib/cloud/instances/${new_instance_id}
+
+        # Link the old id to the new one, just incase
+        ln -s /var/lib/cloud/instances/${new_instance_id} \
+              /var/lib/cloud/instances/${old_instance_id}
+
+        # Make the active instance the new id
+        ln -s /var/lib/cloud/instances/${new_instance_id} \
+              /var/lib/cloud/instance
+  fi
+fi
+
+}
+
 if [ "$1" = "configure" ]; then
    # disable ureadahead (LP: #499520)
    dpkg-divert --package cloud-init --rename --divert \
@@ -233,6 +280,8 @@
    # fix issue where cloud-init misidentifies the location of grub
    fix_1336855
 
+   # convert instance ID to new format
+   apply_lp_1506187
 fi
 
 #DEBHELPER#