From e3e62e8bdf7e2bf02fdeacfc7625a08a67a9db21 Mon Sep 17 00:00:00 2001 From: Joseph Bajin Date: Mon, 18 Aug 2014 10:32:54 -0400 Subject: new: Added FreeBSD support to ConfigDrive --- cloudinit/sources/DataSourceConfigDrive.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'cloudinit/sources/DataSourceConfigDrive.py') diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py index 0c35f83a..7416ceec 100644 --- a/cloudinit/sources/DataSourceConfigDrive.py +++ b/cloudinit/sources/DataSourceConfigDrive.py @@ -37,7 +37,9 @@ DEFAULT_METADATA = { VALID_DSMODES = ("local", "net", "pass", "disabled") FS_TYPES = ('vfat', 'iso9660') LABEL_TYPES = ('config-2',) -OPTICAL_DEVICES = tuple(('/dev/sr%s' % i for i in range(0, 2))) +POSSIBLE_MOUNTS = ('sr', 'cd') +OPTICAL_DEVICES = tuple(('/dev/%s%s' % (z,i) for z in POSSIBLE_MOUNTS + for i in range(0, 2))) class DataSourceConfigDrive(openstack.SourceMixin, sources.DataSource): @@ -70,7 +72,15 @@ class DataSourceConfigDrive(openstack.SourceMixin, sources.DataSource): if not found: for dev in find_candidate_devs(): try: - results = util.mount_cb(dev, read_config_drive) + # Set mtype if freebsd and turn off sync + if dev.startswith("/dev/cd"): + mtype = "cd9660" + sync = False + else: + mtype = None + sync = True + results = util.mount_cb(dev, read_config_drive, mtype=mtype, + sync=sync) found = dev except openstack.NonReadable: pass -- cgit v1.2.3 From 7dbebd3fe9384ba90fce88cb715472d92e00e987 Mon Sep 17 00:00:00 2001 From: Joseph Bajin Date: Mon, 18 Aug 2014 11:16:45 -0400 Subject: fix: Updated some syntax to be pep8 compliant --- cloudinit/sources/DataSourceConfigDrive.py | 6 +++--- cloudinit/util.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cloudinit/sources/DataSourceConfigDrive.py') 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: -- cgit v1.2.3