Blame SOURCES/autofs-5.0.9-amd-lookup-add-cdfs-fs-type.patch

6bbd11
autofs-5.0.8 - amd lookup add cdfs fs type
6bbd11
6bbd11
From: Ian Kent <raven@themaw.net>
6bbd11
6bbd11
6bbd11
---
6bbd11
 include/parse_amd.h |    1 +
6bbd11
 modules/amd_parse.y |    3 +++
6bbd11
 modules/amd_tok.l   |    2 +-
6bbd11
 modules/parse_amd.c |    1 +
6bbd11
 4 files changed, 6 insertions(+), 1 deletion(-)
6bbd11
6bbd11
diff --git a/include/parse_amd.h b/include/parse_amd.h
6bbd11
index 4015e9f..401aadb 100644
6bbd11
--- a/include/parse_amd.h
6bbd11
+++ b/include/parse_amd.h
6bbd11
@@ -28,6 +28,7 @@
6bbd11
 #define AMD_MOUNT_TYPE_XFS	0x00000200
6bbd11
 #define AMD_MOUNT_TYPE_JFS	0x00000400
6bbd11
 #define AMD_MOUNT_TYPE_CACHEFS	0x00000800
6bbd11
+#define AMD_MOUNT_TYPE_CDFS	0x00001000
6bbd11
 #define AMD_MOUNT_TYPE_MASK	0x0000ffff
6bbd11
 
6bbd11
 #define AMD_ENTRY_CUT		0x00010000
6bbd11
diff --git a/modules/amd_parse.y b/modules/amd_parse.y
6bbd11
index 1d4a0a3..87e3309 100644
6bbd11
--- a/modules/amd_parse.y
6bbd11
+++ b/modules/amd_parse.y
6bbd11
@@ -269,6 +269,9 @@ option_assignment: MAP_OPTION OPTION_ASSIGN FS_TYPE
6bbd11
 			   !strcmp($3, "ext4")) {
6bbd11
 			entry.flags |= AMD_MOUNT_TYPE_EXT;
6bbd11
 			entry.type = amd_strdup($3);
6bbd11
+		} else if (!strcmp($3, "cdfs")) {
6bbd11
+			entry.flags |= AMD_MOUNT_TYPE_CDFS;
6bbd11
+			entry.type = amd_strdup("iso9660");
6bbd11
 		} else if (!strcmp($3, "jfs") ||
6bbd11
 			   !strcmp($3, "nfsx") ||
6bbd11
 			   !strcmp($3, "program") ||
6bbd11
diff --git a/modules/amd_tok.l b/modules/amd_tok.l
6bbd11
index 8a6d40c..10b1963 100644
6bbd11
--- a/modules/amd_tok.l
6bbd11
+++ b/modules/amd_tok.l
6bbd11
@@ -99,7 +99,7 @@ MNTOPT		(opts|addopts|remopts)
6bbd11
 FSOPTS		(rhost|rfs|dev|cachedir|mount|unmount|umount|delay)
6bbd11
 CHEOPT		(mapdefault|none|inc|re|regexp|all)
6bbd11
 MAPTYPE		(file|nis|nisplus|ldap|hesiod|exec|ndbm|passwd|union)
6bbd11
-FSTYPE_LOCAL	(link|linkx|lofs|ext2|ext3|ext4|xfs|jfs|cachefs)
6bbd11
+FSTYPE_LOCAL	(link|linkx|lofs|ext2|ext3|ext4|xfs|jfs|cdfs|cachefs)
6bbd11
 FSTYPE_NET	(nfs|nfsx|nfsl|host)
6bbd11
 FSTYPE		(auto|program|direct|lustre|{FSTYPE_LOCAL}|{FSTYPE_NET})
6bbd11
 
6bbd11
diff --git a/modules/parse_amd.c b/modules/parse_amd.c
6bbd11
index bc53b1d..fa0f75d 100644
6bbd11
--- a/modules/parse_amd.c
6bbd11
+++ b/modules/parse_amd.c
6bbd11
@@ -1286,6 +1286,7 @@ static int amd_mount(struct autofs_point *ap, const char *name,
6bbd11
 
6bbd11
 	case AMD_MOUNT_TYPE_EXT:
6bbd11
 	case AMD_MOUNT_TYPE_XFS:
6bbd11
+	case AMD_MOUNT_TYPE_CDFS:
6bbd11
 		if (!validate_generic_options(ap->logopt, fstype, entry))
6bbd11
 			return 1;
6bbd11
 		ret = do_generic_mount(ap, name, entry, entry->dev, flags);