diff -Nru cloud-init-0.7.5/debian/changelog cloud-init-0.7.5/debian/changelog
--- cloud-init-0.7.5/debian/changelog	2015-08-14 18:23:32.000000000 +0100
+++ cloud-init-0.7.5/debian/changelog	2015-09-02 16:10:02.000000000 +0100
@@ -1,3 +1,13 @@
+cloud-init (0.7.5-0ubuntu1.9) trusty; urgency=medium
+
+  * d/cloud-init.templates: Include SmartOS data source in the default list
+    and choices (LP: #1398997).
+  * d/patches/lp-1490796-azure-fix-mount_cb-for-symlinks.patch:
+      - Fix a regression caused by switching to /dev/disk symlinks
+        (LP: #1490796).
+
+ -- Daniel Watkins <daniel.watkins@canonical.com>  Wed, 02 Sep 2015 16:09:33 +0100
+
 cloud-init (0.7.5-0ubuntu1.8) trusty; urgency=medium
 
   * debian/patches/lp-1411582-azure-udev-ephemeral-disks.patch:
diff -Nru cloud-init-0.7.5/debian/cloud-init.templates cloud-init-0.7.5/debian/cloud-init.templates
--- cloud-init-0.7.5/debian/cloud-init.templates	2014-10-02 17:59:09.000000000 +0100
+++ cloud-init-0.7.5/debian/cloud-init.templates	2015-09-02 16:07:34.000000000 +0100
@@ -1,8 +1,8 @@
 Template: cloud-init/datasources
 Type: multiselect
-Default: NoCloud, ConfigDrive, OpenNebula, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, Ec2, CloudStack, None
-Choices-C: NoCloud, ConfigDrive, OpenNebula, Azure, AltCloud, OVF, MAAS, GCE, Openstack, CloudSigma, Ec2, CloudStack, None
-Choices: NoCloud: Reads info from /var/lib/cloud/seed only, ConfigDrive: Reads data from Openstack Config Drive, OpenNebula: read from OpenNebula context disk, Azure: read from MS Azure cdrom. Requires walinux-agent, AltCloud: config disks for RHEVm and vSphere, OVF: Reads data from OVF Transports, MAAS: Reads data from Ubuntu MAAS, GCE: google compute metadata service, OpenStack: native openstack metadata service, CloudSigma: metadata over serial for cloudsigma.com, Ec2: reads data from EC2 Metadata service, CloudStack: Read from CloudStack metadata service, None: Failsafe datasource
+Default: NoCloud, ConfigDrive, OpenNebula, Azure, AltCloud, OVF, MAAS, GCE, OpenStack, CloudSigma, Ec2, CloudStack, SmartOS, None
+Choices-C: NoCloud, ConfigDrive, OpenNebula, Azure, AltCloud, OVF, MAAS, GCE, Openstack, CloudSigma, Ec2, CloudStack, SmartOS, None
+Choices: NoCloud: Reads info from /var/lib/cloud/seed only, ConfigDrive: Reads data from Openstack Config Drive, OpenNebula: read from OpenNebula context disk, Azure: read from MS Azure cdrom. Requires walinux-agent, AltCloud: config disks for RHEVm and vSphere, OVF: Reads data from OVF Transports, MAAS: Reads data from Ubuntu MAAS, GCE: google compute metadata service, OpenStack: native openstack metadata service, CloudSigma: metadata over serial for cloudsigma.com, Ec2: reads data from EC2 Metadata service, CloudStack: Read from CloudStack metadata service, SmartOS: Read from SmartOS metadata service, None: Failsafe datasource
 Description: Which data sources should be searched?
  Cloud-init supports searching different "Data Sources" for information
  that it uses to configure a cloud instance.
diff -Nru cloud-init-0.7.5/debian/patches/lp-1490796-azure-fix-mount_cb-for-symlinks.patch cloud-init-0.7.5/debian/patches/lp-1490796-azure-fix-mount_cb-for-symlinks.patch
--- cloud-init-0.7.5/debian/patches/lp-1490796-azure-fix-mount_cb-for-symlinks.patch	1970-01-01 01:00:00.000000000 +0100
+++ cloud-init-0.7.5/debian/patches/lp-1490796-azure-fix-mount_cb-for-symlinks.patch	2015-09-02 16:08:03.000000000 +0100
@@ -0,0 +1,17 @@
+Description: Handle symlinks as devices in mount_cb
+Author: Daniel Watkins <daniel.watkins@canonical.com>
+Origin: upstream, http://bazaar.launchpad.net/~cloud-init-dev/cloud-init/trunk/revision/1139
+Bug: https://bugs.launchpad.net/cloud-init/+bug/1490796
+--- a/cloudinit/util.py
++++ b/cloudinit/util.py
+@@ -1352,8 +1352,8 @@
+     mounted = mounts()
+     with tempdir() as tmpd:
+         umount = False
+-        if device in mounted:
+-            mountpoint = mounted[device]['mountpoint']
++        if os.path.realpath(device) in mounted:
++            mountpoint = mounted[os.path.realpath(device)]['mountpoint']
+         else:
+             try:
+                 mountcmd = ['mount']
diff -Nru cloud-init-0.7.5/debian/patches/series cloud-init-0.7.5/debian/patches/series
--- cloud-init-0.7.5/debian/patches/series	2015-08-14 18:23:32.000000000 +0100
+++ cloud-init-0.7.5/debian/patches/series	2015-09-02 16:08:03.000000000 +0100
@@ -12,3 +12,4 @@
 lp-1411582-azure-udev-ephemeral-disks.patch
 lp-1470880-fix-gce-az-determination.patch
 lp-1470890-include-regions-in-dynamic-mirror-discovery.patch
+lp-1490796-azure-fix-mount_cb-for-symlinks.patch