diff options
| -rw-r--r-- | cloudinit/sources/DataSourceConfigDrive.py | 6 | ||||
| -rw-r--r-- | cloudinit/util.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py index 7416ceec..82caf6eb 100644 --- a/cloudinit/sources/DataSourceConfigDrive.py +++ b/cloudinit/sources/DataSourceConfigDrive.py @@ -38,7 +38,7 @@ VALID_DSMODES = ("local", "net", "pass", "disabled") FS_TYPES = ('vfat', 'iso9660') LABEL_TYPES = ('config-2',) POSSIBLE_MOUNTS = ('sr', 'cd') -OPTICAL_DEVICES = tuple(('/dev/%s%s' % (z,i) for z in POSSIBLE_MOUNTS +OPTICAL_DEVICES = tuple(('/dev/%s%s' % (z, i) for z in POSSIBLE_MOUNTS for i in range(0, 2))) @@ -75,10 +75,10 @@ class DataSourceConfigDrive(openstack.SourceMixin, sources.DataSource): # Set mtype if freebsd and turn off sync if dev.startswith("/dev/cd"): mtype = "cd9660" - sync = False + sync = False else: mtype = None - sync = True + sync = True results = util.mount_cb(dev, read_config_drive, mtype=mtype, sync=sync) found = dev diff --git a/cloudinit/util.py b/cloudinit/util.py index a8a26325..82d75843 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -1391,7 +1391,7 @@ def mount_cb(device, callback, data=None, rw=False, mtype=None, sync=True): lazy_support = False else: lazy_support = True - with unmounter(umount,lazy_support): + with unmounter(umount, lazy_support): if data is None: ret = callback(mountpoint) else: |