x/cloud-init
Code Issues Proposed changes

Fixed up issue with attempt to mount nonexistant swap

Browse Source
This commit is contained in:
Ben Howard 2013-10-04 15:52:20 -06:00
parent c5c8b81904
commit 8f25cdf17f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloudinit/config/cc_mounts.py
View File

@ -45,7 +45,7 @@ def is_mdname(name):
return False return False
def sanitize_devname(devname, transformer, log) def sanitize_devname(startname, transformer, log):
log.debug("Attempting to determine the real name of %s", startname) log.debug("Attempting to determine the real name of %s", startname)
# workaround, allow user to specify 'ephemeral' # workaround, allow user to specify 'ephemeral'
@ -96,6 +96,7 @@ def handle(_name, cfg, cloud, log, _args):
sanitized = sanitize_devname(start, cloud.device_name_to_device, log) sanitized = sanitize_devname(start, cloud.device_name_to_device, log)
if sanitized is None: if sanitized is None:
log.debug("Ignorming nonexistant named mount %s", start) log.debug("Ignorming nonexistant named mount %s", start)
continue
if sanitized != start: if sanitized != start:
log.debug("changed %s => %s" % (start, sanitized)) log.debug("changed %s => %s" % (start, sanitized))
@ -132,6 +133,7 @@ def handle(_name, cfg, cloud, log, _args):
sanitized = sanitize_devname(start, cloud.device_name_to_device, log) sanitized = sanitize_devname(start, cloud.device_name_to_device, log)
if sanitized is None: if sanitized is None:
log.debug("Ignoring nonexistant default named mount %s", start) log.debug("Ignoring nonexistant default named mount %s", start)
continue
if sanitized != start: if sanitized != start:
log.debug("changed default device %s => %s" % (start, sanitized)) log.debug("changed default device %s => %s" % (start, sanitized))
defmnt[0] = sanitized defmnt[0] = sanitized