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