cloud-init

Merge lp:~darkmuggle-deactivatedaccount/cloud-init/lp1236594-bad_ephemeral0_mnt into lp:~cloud-init-dev/cloud-init/trunk

  1. lp1236594-bad_ephemeral0_mnt
  2. Merge into trunk
Proposed by Ben Howard
Status: Merged
Merged at revision: 887
Proposed branch: lp:~darkmuggle-deactivatedaccount/cloud-init/lp1236594-bad_ephemeral0_mnt
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 22 lines (+1/-4)
1 file modified
cloudinit/config/cc_mounts.py (+1/-4)
To merge this branch: bzr merge lp:~darkmuggle-deactivatedaccount/cloud-init/lp1236594-bad_ephemeral0_mnt
Reviewer Review Type Date Requested Status
Scott Moser Pending
Review via email: mp+189707@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
=== modified file 'cloudinit/config/cc_mounts.py'
--- cloudinit/config/cc_mounts.py 2013-10-04 22:29:12 +0000
+++ cloudinit/config/cc_mounts.py 2013-10-07 21:16:17 +0000
@@ -222,9 +222,6 @@
222 if not os.path.exists(device):222 if not os.path.exists(device):
223 return None223 return None
224224
225 if not partition:
226 return device
227
228 short_name = os.path.basename(device)225 short_name = os.path.basename(device)
229 sys_path = "/sys/block/%s" % short_name226 sys_path = "/sys/block/%s" % short_name
230227
@@ -239,7 +236,7 @@
239236
240 if partition is None:237 if partition is None:
241 valid_mappings = [sys_long_path + "1",238 valid_mappings = [sys_long_path + "1",
242 sys_long_path + "p1" % partition]239 sys_long_path + "p1"]
243 elif partition != "0":240 elif partition != "0":
244 valid_mappings = [sys_long_path + "%s" % partition,241 valid_mappings = [sys_long_path + "%s" % partition,
245 sys_long_path + "p%s" % partition]242 sys_long_path + "p%s" % partition]