diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:35 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:35 -0400 |
| commit | abf9ea33938d7ed304791788df2bdf74147a28de (patch) | |
| tree | 510f8902f19f24c8a5ccc4376f1ecf1328f244a0 | |
| parent | a4fc0accc44a4e974a48c142d36adfe5547ff9cd (diff) | |
| download | cloud-init-git-abf9ea33938d7ed304791788df2bdf74147a28de.tar.gz | |
Import version 0.6.3-0ubuntu1.20ubuntu/0.6.3-0ubuntu1.20
Imported using git-dsc-commit.
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/lp-1490796-azure-fix-mount_cb-for-symlinks.patch | 17 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 985a1bb0..53a8c011 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +cloud-init (0.6.3-0ubuntu1.20) precise; urgency=medium + + * debian/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 13:24:28 +0100 + cloud-init (0.6.3-0ubuntu1.19) precise; urgency=medium * debian/patches/lp-1411582-azure-udev-ephemeral-disks.patch: diff --git a/debian/patches/lp-1490796-azure-fix-mount_cb-for-symlinks.patch b/debian/patches/lp-1490796-azure-fix-mount_cb-for-symlinks.patch new file mode 100644 index 00000000..7493e2f3 --- /dev/null +++ b/debian/patches/lp-1490796-azure-fix-mount_cb-for-symlinks.patch @@ -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 +@@ -804,8 +804,8 @@ + mounted[dev] = (dev, fstype, mp, False) + + umount = False +- if device in mounted: +- mountpoint = "%s/" % mounted[device][2] ++ if os.path.realpath(device) in mounted: ++ mountpoint = "%s/" % mounted[os.path.realpath(device)][2] + else: + tmpd = tempfile.mkdtemp() + diff --git a/debian/patches/series b/debian/patches/series index 630c04ed..1090c333 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -33,3 +33,4 @@ lp-1464253-handle-new-cloudstack-passwords.patch 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 |