1
------------------------------------------------------------
3
fixes bug: https://launchpad.net/bugs/1236594
4
committer: Scott Moser <smoser@ubuntu.com>
6
timestamp: Mon 2013-10-07 20:08:13 -0400
8
fix bug mounting first partition of a alias'd name.
10
The expected behavior was that 'ephemeral0' in a mount device entry
11
and ephemeral0 mapped to /dev/xvdb that /dev/xvdb1 or /dev/xvdb would
14
Explicitly setting 'ephemeral0.0' would mean only xvdb in this case.
15
------------------------------------------------------------
16
Use --include-merged or -n0 to see merged revisions.
17
=== modified file 'ChangeLog'
19
=== modified file 'cloudinit/config/cc_mounts.py'
20
--- a/cloudinit/config/cc_mounts.py
21
+++ b/cloudinit/config/cc_mounts.py
22
@@ -222,9 +222,6 @@ def devnode_for_dev_part(device, partiti
23
if not os.path.exists(device):
29
short_name = os.path.basename(device)
30
sys_path = "/sys/block/%s" % short_name
32
@@ -238,8 +235,7 @@ def devnode_for_dev_part(device, partiti
33
partition = str(partition)
36
- valid_mappings = [sys_long_path + "1",
37
- sys_long_path + "p1" % partition]
38
+ valid_mappings = [sys_long_path + "1", sys_long_path + "p1"]
39
elif partition != "0":
40
valid_mappings = [sys_long_path + "%s" % partition,
41
sys_long_path + "p%s" % partition]