X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=0c8d3e1baf83779b9447893d3d796bf3b7bfd0f2;hp=72480b7e0d279429b870d5b0a3db2107b95081cf;hb=72ada109b86622db8009e774ebc96a7a92094e8a;hpb=8c562efffb0e4e4e084f9605d0b9e1468b642eb4

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 72480b7..0c8d3e1 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -304,9 +304,6 @@ static struct mount_options *rewrite_mount_options(char *str)
 	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);
@@ -317,9 +314,6 @@ static struct mount_options *rewrite_mount_options(char *str)
 		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) {
@@ -575,6 +569,95 @@ static int nfsmount_fg(const char *spec, const char *node,
 	return EX_FAIL;
 }
 
+/*
+ * Handle "background" NFS mount [first try]
+ *
+ * Returns a valid mount command exit code.
+ *
+ * EX_BG should cause the caller to fork and invoke nfsmount_child.
+ */
+static int nfsmount_parent(const char *spec, const char *node,
+			   const char *type, char *hostname, int flags,
+			   struct mount_options *options,
+			   int fake, char **extra_opts)
+{
+	if (try_mount(spec, node, type, flags, options,
+					fake, extra_opts))
+		return EX_SUCCESS;
+
+	if (is_permanent_error(errno)) {
+		mount_error(spec, node, errno);
+		return EX_FAIL;
+	}
+
+	sys_mount_errors(hostname, errno, 1, 1);
+	return EX_BG;
+}
+
+/*
+ * Handle "background" NFS mount [retry daemon]
+ *
+ * Returns a valid mount command exit code: EX_SUCCESS if successful,
+ * EX_FAIL if a failure occurred.  There's nothing to catch the
+ * error return, though, so we use sys_mount_errors to log the
+ * failure.
+ */
+static int nfsmount_child(const char *spec, const char *node,
+			  const char *type, char *hostname, int flags,
+			  struct mount_options *options,
+			  int fake, char **extra_opts)
+{
+	unsigned int secs = 1;
+	time_t timeout = time(NULL);
+	char *retry;
+
+	timeout += 60 * 10000;		/* default: 10,000 minutes */
+	retry = po_get(options, "retry");
+	if (retry)
+		timeout += 60 * atoi(retry);
+
+	for (;;) {
+		if (sleep(secs))
+			break;
+		secs <<= 1;
+		if (secs > 120)
+			secs = 120;
+
+		if (try_mount(spec, node, type, flags, options,
+							fake, extra_opts))
+			return EX_SUCCESS;
+
+		if (is_permanent_error(errno))
+			break;
+
+		if (time(NULL) > timeout)
+			break;
+
+		sys_mount_errors(hostname, errno, 1, 1);
+	};
+
+	sys_mount_errors(hostname, errno, 1, 0);
+	return EX_FAIL;
+}
+
+/*
+ * Handle "background" NFS mount
+ *
+ * Returns a valid mount command exit code.
+ */
+static int nfsmount_bg(const char *spec, const char *node,
+			  const char *type, char *hostname, int flags,
+			  struct mount_options *options,
+			  int fake, int child, char **extra_opts)
+{
+	if (!child)
+		return nfsmount_parent(spec, node, type, hostname, flags,
+					options, fake, extra_opts);
+	else
+		return nfsmount_child(spec, node, type, hostname, flags,
+					options, fake, extra_opts);
+}
+
 /**
  * nfsmount_string - Mount an NFS file system using C string options
  * @spec: C string specifying remote share to mount ("hostname:path")
@@ -592,32 +675,32 @@ int nfsmount_string(const char *spec, const char *node, const char *type,
 	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))
 		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;
 }