[prev in list] [next in list] [prev in thread] [next in thread] 

List:       util-linux-ng
Subject:    [PATCH v2] libmount: fix support of comma-separated fs types lists
From:       Gleb Fotengauer-Malinovskiy <glebfm () altlinux ! org>
Date:       2012-09-27 16:48:34
Message-ID: 20120927164834.GA19341 () c227 ! office ! altlinux ! ru
[Download RAW message or body]

	# 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 <glebfm@altlinux.org>
---
 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)

-- 
	glebfm
	Гле  Фотенгауэр-Малиновский

--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]