Subject: [PATCH v2] libmount: fix support of comma-separated fs types lists From: Gleb Fotengauer-Malinovskiy Date: 27.09.2012 20:48 To: Karel Zak Cc: util-linux@vger.kernel.org # grep cdrom /etc/fstab /dev/sr0 /media/cdrom udf,iso9660 ro,noauto,user,utf8 0 0 # mount /media/cdrom mount: unknown filesystem type 'udf,iso9660' # mount -t udf,iso9660 /dev/sr0 /media/cdrom mount: /dev/sr0 is write-protected, mounting read-only Signed-off-by: Gleb Fotengauer-Malinovskiy --- libmount/src/context_mount.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c index f3d8ff1..867e644 100644 --- a/libmount/src/context_mount.c +++ b/libmount/src/context_mount.c @@ -691,9 +691,12 @@ int mnt_context_do_mount(struct libmnt_context *cxt) cxt->mountdata = (char *) mnt_fs_get_fs_options(cxt->fs); type = mnt_fs_get_fstype(cxt->fs); - if (type) - res = do_mount(cxt, NULL); - else + if (type) { + if (strchr(type, ',')) + res = do_mount_by_pattern(cxt, type); + else + res = do_mount(cxt, NULL); + } else res = do_mount_by_pattern(cxt, cxt->fstype_pattern); if (mnt_context_get_status(cxt)