diff options
| author | Scott Moser <smoser@brickies.net> | 2017-01-10 11:25:29 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-01-10 11:25:29 -0500 |
| commit | 7bdde5eda9e62a2362cfa71ae984b5ebbcdb795f (patch) | |
| tree | 730dec70091c7cda8dd3e1970b62cd5440a5839a | |
| parent | 9d2dfea8eeeb058ea0bd421cc8e382b056de6185 (diff) | |
| download | cloud-init-git-7bdde5eda9e62a2362cfa71ae984b5ebbcdb795f.tar.gz | |
Import version 0.7.5-0ubuntu1.10ubuntu/0.7.5-0ubuntu1.10
Imported using git-import-dsc
| -rw-r--r-- | debian/changelog | 11 | ||||
| -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, 28 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 8e5193a1..60b31857 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <ben.howard@ubuntu.com> 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 <daniel.watkins@canonical.com> Mon, 20 Apr 2015 14:21:13 +0100 + -- Daniel Watkins <daniel.watkins@canonical.com> Wed, 02 Sep 2015 16:09:33 +0100 cloud-init (0.7.5-0ubuntu1.8) trusty; urgency=medium 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..8a762b71 --- /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 +@@ -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 --git a/debian/patches/series b/debian/patches/series index c1deb3cf..a238b1bc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,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 |