*
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <ctype.h>
#include <unistd.h>
#include <stdio.h>
return 0;
}
+/*
+ * Returns zero if the "lock" option is in effect, but statd
+ * can't be started. Otherwise, returns 1.
+ */
+static int verify_lock_option(struct mount_options *options)
+{
+ if (po_rightmost(options, "nolock", "lock") == PO_KEY1_RIGHTMOST)
+ return 1;
+
+ if (!start_statd()) {
+ nfs_error(_("%s: rpc.statd is not running but is "
+ "required for remote locking."), progname);
+ nfs_error(_("%s: Either use '-o nolock' to keep "
+ "locks local, or start statd."), progname);
+ return 0;
+ }
+
+ return 1;
+}
+
/*
* Set up mandatory mount options.
*
* Returns 1 if successful; otherwise zero.
*/
-static int set_mandatory_options(const char *type,
- struct sockaddr_in *saddr,
- struct mount_options *options)
+static int validate_options(const char *type,
+ struct sockaddr_in *saddr,
+ struct mount_options *options,
+ int fake)
{
if (!append_addr_option(saddr, options))
return 0;
} else {
if (!fix_mounthost_option(options))
return 0;
+ if (!fake && !verify_lock_option(options))
+ return 0;
}
return 1;
static int is_permanent_error(int error)
{
switch (error) {
- case EACCES:
case ESTALE:
case ETIMEDOUT:
case ECONNREFUSED:
if (option)
mnt_server.pmap.pm_port = atoi(option);
mnt_server.pmap.pm_prog = MOUNTPROG;
- option = po_get(options, "mountprog");
- if (option)
- mnt_server.pmap.pm_prog = atoi(option);
option = po_get(options, "mountvers");
if (option)
mnt_server.pmap.pm_vers = atoi(option);
po_remove_all(options, "port");
}
nfs_server.pmap.pm_prog = NFS_PROGRAM;
- option = po_get(options, "nfsprog");
- if (option)
- nfs_server.pmap.pm_prog = atoi(option);
option = po_get(options, "nfsvers");
if (option) {
struct mount_options *options = NULL;
struct sockaddr_in saddr;
char *hostname;
- int err, retval = EX_FAIL;
+ int retval = EX_FAIL;
if (!parse_devname(spec, &hostname))
- goto out;
- err = fill_ipv4_sockaddr(hostname, &saddr);
- free(hostname);
- if (!err)
- goto out;
+ return retval;
+ if (!fill_ipv4_sockaddr(hostname, &saddr))
+ goto fail;
options = po_split(*extra_opts);
if (!options) {
nfs_error(_("%s: internal option parsing error"), progname);
- goto out;
+ goto fail;
}
- if (!set_mandatory_options(type, &saddr, options))
+ if (!validate_options(type, &saddr, options, fake))
goto out;
- if (try_mount(spec, node, type, flags, options, fake, extra_opts)) {
- mount_error(spec, node, errno);
- goto out;
- }
-
- retval = EX_SUCCESS;
+ if (po_rightmost(options, "bg", "fg") == PO_KEY1_RIGHTMOST)
+ retval = nfsmount_bg(spec, node, type, hostname, flags,
+ options, fake, child, extra_opts);
+ else
+ retval = nfsmount_fg(spec, node, type, flags, options,
+ fake, extra_opts);
out:
po_destroy(options);
+fail:
+ free(hostname);
return retval;
}