summaryrefslogtreecommitdiff
path: root/cloudinit/config
diff options
context:
space:
mode:
Diffstat (limited to 'cloudinit/config')
-rw-r--r--cloudinit/config/cc_mounts.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/cloudinit/config/cc_mounts.py b/cloudinit/config/cc_mounts.py
index 84ec928f..80590118 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
@@ -238,8 +235,7 @@ def devnode_for_dev_part(device, partition):
partition = str(partition)
if partition is None:
- valid_mappings = [sys_long_path + "1",
- sys_long_path + "p1" % partition]
+ valid_mappings = [sys_long_path + "1", sys_long_path + "p1"]
elif partition != "0":
valid_mappings = [sys_long_path + "%s" % partition,
sys_long_path + "p%s" % partition]