summaryrefslogtreecommitdiff
path: root/cloudinit/sources/DataSourceConfigDrive.py
diff options
context:
space:
mode:
authorJoseph Bajin <josephbajin@gmail.com>2014-08-18 10:32:54 -0400
committerJoseph Bajin <josephbajin@gmail.com>2014-08-18 10:32:54 -0400
commite3e62e8bdf7e2bf02fdeacfc7625a08a67a9db21 (patch)
treeae23a7dd8e07800c0bde4311c76c3b7d41cd75e8 /cloudinit/sources/DataSourceConfigDrive.py
parentb5b8ba8aea6aec063d7fe4a872a7daa188bbbbc6 (diff)
downloadvyos-cloud-init-e3e62e8bdf7e2bf02fdeacfc7625a08a67a9db21.tar.gz
vyos-cloud-init-e3e62e8bdf7e2bf02fdeacfc7625a08a67a9db21.zip
new: Added FreeBSD support to ConfigDrive
Diffstat (limited to 'cloudinit/sources/DataSourceConfigDrive.py')
-rw-r--r--cloudinit/sources/DataSourceConfigDrive.py14
1 files changed, 12 insertions, 2 deletions
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