cloud-init

Merge lp:~oddbloke/cloud-init/fix_mount_cb_symlink into lp:~cloud-init-dev/cloud-init/trunk

  1. fix_mount_cb_symlink
  2. Merge into trunk
Proposed by Dan Watkins
Status: Merged
Merged at revision: 1139
Proposed branch: lp:~oddbloke/cloud-init/fix_mount_cb_symlink
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 14 lines (+2/-2)
1 file modified
cloudinit/util.py (+2/-2)
To merge this branch: bzr merge lp:~oddbloke/cloud-init/fix_mount_cb_symlink
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+269789@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cloudinit/util.py'
2--- cloudinit/util.py 2015-08-06 23:34:57 +0000
3+++ cloudinit/util.py 2015-09-01 17:27:57 +0000
4@@ -1480,8 +1480,8 @@
5 mounted = mounts()
6 with tempdir() as tmpd:
7 umount = False
8- if device in mounted:
9- mountpoint = mounted[device]['mountpoint']
10+ if os.path.realpath(device) in mounted:
11+ mountpoint = mounted[os.path.realpath(device)]['mountpoint']
12 else:
13 failure_reason = None
14 for mtype in mtypes: