From b6bd744326afe4135b44dfa824e7c26219583b8c Mon Sep 17 00:00:00 2001
From: rodrigc <rodrigc@FreeBSD.org>
Date: Wed, 16 Nov 2005 02:13:27 +0000
Subject: Do not pass noauto to nmount() or external mount program.

Noticed by:	maxim
---
 sbin/mount/mount.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index f2eeff5..d950216 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -626,7 +626,16 @@ mangle(options, argcp, argv)
 	argc = *argcp;
 	for (s = options; (p = strsep(&s, ",")) != NULL;)
 		if (*p != '\0') {
-			if (*p == '-') {
+			if (strcmp(p, "noauto") == 0) {
+				/*
+				 * Do not pass noauto option to nmount().
+				 * or external mount program.  noauto is
+				 * only used to prevent mounting a filesystem
+				 * when 'mount -a' is specified, and is
+				 * not a real mount option.
+				 */
+				continue;
+			} else if (*p == '-') {
 				argv[argc++] = p;
 				p = strchr(p, '=');
 				if (p != NULL) {
-- 
cgit v1.1