From 98201b0c60519aca57aa759d3209f0f467a89151 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Tue, 16 Mar 1999 22:26:51 +0000
Subject: [PATCH] Fixed `mount -a -u ...'.  Rev.1.19 broke this by trying too
 hard to avoid mounting filesystems multiple times.

PR:		10572
Submitted by:	Cy Schubert <cy@cschuber.net.gov.bc.ca>
---
 sbin/mount/mount.c     | 5 +++--
 sbin/mount_ifs/mount.c | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index 493944451690..87ae109b1256 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount.c	8.25 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: mount.c,v 1.28 1998/07/06 07:12:38 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -192,7 +192,8 @@ main(argc, argv)
 					continue;
 				if (hasopt(fs->fs_mntops, "noauto"))
 					continue;
-				if (ismounted(fs, mntbuf, mntsize))
+				if (!(init_flags & MNT_UPDATE) &&
+				    ismounted(fs, mntbuf, mntsize))
 					continue;
 				if (mountfs(fs->fs_vfstype, fs->fs_spec,
 				    fs->fs_file, init_flags, options,
diff --git a/sbin/mount_ifs/mount.c b/sbin/mount_ifs/mount.c
index 493944451690..87ae109b1256 100644
--- a/sbin/mount_ifs/mount.c
+++ b/sbin/mount_ifs/mount.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mount.c	8.25 (Berkeley) 5/8/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: mount.c,v 1.28 1998/07/06 07:12:38 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -192,7 +192,8 @@ main(argc, argv)
 					continue;
 				if (hasopt(fs->fs_mntops, "noauto"))
 					continue;
-				if (ismounted(fs, mntbuf, mntsize))
+				if (!(init_flags & MNT_UPDATE) &&
+				    ismounted(fs, mntbuf, mntsize))
 					continue;
 				if (mountfs(fs->fs_vfstype, fs->fs_spec,
 				    fs->fs_file, init_flags, options,