diff options
author | Scott Moser <smoser@ubuntu.com> | 2014-09-29 08:55:08 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2014-09-29 08:55:08 -0400 |
commit | 143424fcd8666432bb943640b9231c1045e9c5e7 (patch) | |
tree | 5ff92fba00e078a0f3e4c7b94890c3426b24411c | |
parent | cdcf11eeae36e5da5d7ea8a3dca1611987a52089 (diff) | |
download | vyos-cloud-init-143424fcd8666432bb943640b9231c1045e9c5e7.tar.gz vyos-cloud-init-143424fcd8666432bb943640b9231c1045e9c5e7.zip |
further platform cleanup
-rw-r--r-- | cloudinit/util.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index 63c34b32..76e91951 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -1359,18 +1359,19 @@ def mount_cb(device, callback, data=None, rw=False, mtype=None, sync=True): mtypes = None # clean up 'mtype' input a bit based on platform. - platform_lower = platform.system.lower() - if platform_lower == "linux": + platsys = platform.system().lower() + if platsys == "linux": if mtypes is None: mtypes = ["auto"] - elif platform_lower.endswith("bsd"): + elif platsys.endswith("bsd"): if mtypes is None: mtypes = ['ufs', 'cd9660', 'vfat'] for index, mtype in enumerate(mtypes): if mtype == "iso9660": mtypes[index] = "cd9660" else: - mtypes = [] + # we cannot do a smart "auto", so just call 'mount' once with no -t + mtypes = [''] mounted = mounts() with tempdir() as tmpd: |