diff options
author | Scott Moser <smoser@ubuntu.com> | 2014-09-22 14:35:03 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2014-09-22 14:35:03 -0400 |
commit | f4d3f05827b3302960eedb6278500a3b007eb807 (patch) | |
tree | 9ffa326b5b58aa2bff621d8c957605c194152429 /cloudinit/sources/DataSourceOVF.py | |
parent | b9f0bcbc087a0c7c4a87f83ddf5713a4f849a488 (diff) | |
download | vyos-cloud-init-f4d3f05827b3302960eedb6278500a3b007eb807.tar.gz vyos-cloud-init-f4d3f05827b3302960eedb6278500a3b007eb807.zip |
support 'mtype' as a list, and fix up freebsd mount types
this supports a list of input, and cleans up that list
for the platform specific mount types. Basically,
mtype = None
means 'mount -t auto' or the equivalent for the platform.
and 'iso9660' means "iso type".
Diffstat (limited to 'cloudinit/sources/DataSourceOVF.py')
-rw-r--r-- | cloudinit/sources/DataSourceOVF.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceOVF.py b/cloudinit/sources/DataSourceOVF.py index 2f53c1ba..7ba60735 100644 --- a/cloudinit/sources/DataSourceOVF.py +++ b/cloudinit/sources/DataSourceOVF.py @@ -215,8 +215,7 @@ def transport_iso9660(require_iso=True): continue try: - (fname, contents) = util.mount_cb(fullp, - get_ovf_env, mtype=mtype) + (fname, contents) = util.mount_cb(fullp, get_ovf_env, mtype=mtype) except util.MountFailedError: LOG.debug("%s not mountable as iso9660" % fullp) continue |