summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2004-01-15 01:36:34 (GMT)
committerH. Peter Anvin <hpa@zytor.com>2004-01-15 01:36:34 (GMT)
commit5212dbb6d11d4968ea7a06e86d9a7ce792b9ae01 (patch)
treec269b9c45fd04fdf40ddbb398f7a974b68338542
parent02f901f6769a427d1c1d60a80fb12070f5d3fd00 (diff)
downloadautofs3-5212dbb6d11d4968ea7a06e86d9a7ce792b9ae01.zip
autofs3-5212dbb6d11d4968ea7a06e86d9a7ce792b9ae01.tar.gz
autofs3-5212dbb6d11d4968ea7a06e86d9a7ce792b9ae01.tar.bz2
autofs3-5212dbb6d11d4968ea7a06e86d9a7ce792b9ae01.tar.xz
Call mount_default rather than mount_nfs. This change does not
seem applicable to Hesiod.
-rw-r--r--modules/parse_sun.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/modules/parse_sun.c b/modules/parse_sun.c
index 6e7c0e9..b920ebc 100644
--- a/modules/parse_sun.c
+++ b/modules/parse_sun.c
@@ -38,7 +38,7 @@
#define MODPREFIX "parse(sun): "
int parse_version = AUTOFS_PARSE_VERSION; /* Required by protocol */
-static struct mount_mod *mount_nfs = NULL;
+static struct mount_mod *mount_default = NULL;
static int init_ctr = 0;
struct substvar {
@@ -363,10 +363,10 @@ int parse_init(int argc, const char * const *argv, void **context)
}
}
- /* We only need this once. NFS mounts are so common that we cache
+ /* We only need this once. DEFAULT mounts are so common that we cache
this module. */
- if ( !mount_nfs )
- if ( (mount_nfs = open_mount("nfs", MODPREFIX)) ) {
+ if ( !mount_default )
+ if ( (mount_default = open_mount("default", MODPREFIX)) ) {
init_ctr++;
return 0;
} else {
@@ -448,7 +448,7 @@ int parse_mount(const char *root, const char *name,
}
}
- fstype = "nfs"; /* Default filesystem type */
+ fstype = "default"; /* Default filesystem type */
/* Scan for -fstype= option, which isn't a real mount option */
@@ -487,9 +487,9 @@ int parse_mount(const char *root, const char *name,
}
free(noptions);
- if ( !strcmp(fstype, "nfs") ) {
- rv = mount_nfs->mount_mount(root, name, name_len, ent, fstype, options,
- mount_nfs->context);
+ if ( !strcmp(fstype, "default") ) {
+ rv = mount_default->mount_mount(root, name, name_len, ent, fstype, options,
+ mount_default->context);
} else {
/* Generic mount routine */
rv = do_mount(root, name, name_len, ent, fstype, options);
@@ -505,8 +505,8 @@ int parse_done(void *context)
struct parse_context *ctxt = (struct parse_context *)context;
if ( --init_ctr == 0 ) {
- rv = close_mount(mount_nfs);
- mount_nfs = NULL;
+ rv = close_mount(mount_default);
+ mount_default = NULL;
}
kill_context(ctxt);
return rv;