diff -Nru cloud-init-0.7.5/debian/changelog cloud-init-0.7.5/debian/changelog --- cloud-init-0.7.5/debian/changelog 2015-09-01 19:35:49.000000000 +0000 +++ cloud-init-0.7.5/debian/changelog 2015-09-02 16:58:26.000000000 +0000 @@ -1,9 +1,18 @@ +cloud-init (0.7.5-0ubuntu1.10) trusty; urgency=medium + + [ Daniel Watkins ] + * d/patches/lp-1490796-azure-fix-mount_cb-for-symlinks.patch: + - Fix a regression caused by switching to /dev/disk symlinks + (LP: #1490796). + + -- Ben Howard Wed, 02 Sep 2015 10:57:30 -0600 + 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). - -- Daniel Watkins Mon, 20 Apr 2015 14:21:13 +0100 + -- Daniel Watkins Wed, 02 Sep 2015 16:09:33 +0100 cloud-init (0.7.5-0ubuntu1.8) trusty; urgency=medium 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 00:00:00.000000000 +0000 +++ cloud-init-0.7.5/debian/patches/lp-1490796-azure-fix-mount_cb-for-symlinks.patch 2015-09-02 16:57:17.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Handle symlinks as devices in mount_cb +Author: Daniel Watkins +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 17:23:32.000000000 +0000 +++ cloud-init-0.7.5/debian/patches/series 2015-09-02 16:57:17.000000000 +0000 @@ -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