From 92b196693410b57e7d1f94eb557513b1aad177ff Mon Sep 17 00:00:00 2001 From: Ben Howard Date: Mon, 7 Oct 2013 15:15:20 -0600 Subject: Fixed bad ehpemeral0 first partition detection (LP: #1236594) --- cloudinit/config/cc_mounts.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'cloudinit/config/cc_mounts.py') diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py index 84ec928f..729110d7 100644 --- a/cloudinit/config/cc_mounts.py +++ b/cloudinit/config/cc_mounts.py @@ -222,9 +222,6 @@ def devnode_for_dev_part(device, partition): if not os.path.exists(device): return None - if not partition: - return device - short_name = os.path.basename(device) sys_path = "/sys/block/%s" % short_name @@ -239,7 +236,7 @@ def devnode_for_dev_part(device, partition): if partition is None: valid_mappings = [sys_long_path + "1", - sys_long_path + "p1" % partition] + sys_long_path + "p1"] elif partition != "0": valid_mappings = [sys_long_path + "%s" % partition, sys_long_path + "p%s" % partition] -- cgit v1.2.3