diff --git a/cloudinit/config/cc_resizefs.py b/cloudinit/config/cc_resizefs.py
index 978d2ee0..8cb1f07b 100644
--- a/cloudinit/config/cc_resizefs.py
+++ b/cloudinit/config/cc_resizefs.py
@@ -110,7 +110,7 @@ def _can_skip_resize_ufs(mount_point, devpth):
     for line in dumpfs_res.splitlines():
         if not line.startswith('#'):
             newfs_cmd = shlex.split(line)
-            opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:m:o:L:'
+            opt_value = 'O:Ua:s:b:d:e:f:g:h:i:jk:l:m:o:t:L:'
             optlist, _args = getopt.getopt(newfs_cmd[1:], opt_value)
             for o, a in optlist:
                 if o == "-s":
diff --git a/cloudinit/util.py b/cloudinit/util.py
index 83727544..90ad7eb5 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -1140,7 +1140,7 @@ def find_devs_with_freebsd(criteria=None, oformat='device',
         devlist = [
             p for p in ['/dev/msdosfs/' + label, '/dev/iso9660/' + label]
             if os.path.exists(p)]
-    elif criteria == "TYPE=vfat":
+    elif criteria == "TYPE=msdosfs":
         devlist = glob.glob("/dev/msdosfs/*")
     elif criteria == "TYPE=iso9660":
         devlist = glob.glob("/dev/iso9660/*")
@@ -1667,7 +1667,7 @@ def mount_cb(device, callback, data=None, mtype=None,
             mtypes = ["auto"]
     elif platsys.endswith("bsd"):
         if mtypes is None:
-            mtypes = ['ufs', 'cd9660', 'vfat']
+            mtypes = ['ufs', 'cd9660', 'msdosfs', 'msdos']
         for index, mtype in enumerate(mtypes):
             if mtype == "iso9660":
                 mtypes[index] = "cd9660"