 @@ -1,14 +1,14 @@
-/*	$NetBSD: mntopts.h,v 1.11 2008/07/31 05:38:04 simonb Exp $	*/
+/*	$NetBSD: mntopts.h,v 1.11.4.1 2009/01/22 20:27:59 snj Exp $	*/
 /*-
  * Copyright (c) 1994
  *      The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -60,26 +60,27 @@ struct mntopt {
 /* Control flags. */
 #define MOPT_FORCE		{ "force",	0, MNT_FORCE, 0 }
 #define MOPT_UPDATE		{ "update",	0, MNT_UPDATE, 0 }
 #define MOPT_RELOAD		{ "reload",	0, MNT_RELOAD, 0 }
 #define MOPT_GETARGS		{ "getargs",	0, MNT_GETARGS,	0 }
 /* Support for old-style "ro", "rw" flags. */
 #define MOPT_RO			{ "ro",		0, MNT_RDONLY, 0 }
 #define MOPT_RW			{ "rw",		1, MNT_RDONLY, 0 }
 /* This is parsed by mount(8), but is ignored by specific mount_*(8)s. */
 #define MOPT_AUTO		{ "auto",	0, 0, 0 }
 #define MOPT_RUMP		{ "rump",	0, 0, 0 }
 #define MOPT_NULL		{ NULL,		0, 0, 0 }
 #define MOPT_FSTAB_COMPAT						\
 	MOPT_RO,							\
 	MOPT_RW,							\
 	MOPT_AUTO
 /* Standard options which all mounts can understand. */
 #define MOPT_STDOPTS							\
 	MOPT_USERQUOTA,							\
 	MOPT_GROUPQUOTA,						\
 	MOPT_FSTAB_COMPAT,						\
 	MOPT_NOCOREDUMP,						\

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: mount.8,v 1.62 2008/08/13 10:00:10 martti Exp $
+.\"	$NetBSD: mount.8,v 1.62.2.1 2009/01/22 20:27:59 snj Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 @@ -19,27 +19,27 @@
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 .\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
 .\"
-.Dd August 4, 2008
+.Dd January 11, 2009
 .Dt MOUNT 8
 .Os
 .Sh NAME
 .Nm mount
 .Nd mount file systems
 .Sh SYNOPSIS
 .Nm
 .Op Fl Aadfruvw
 .Op Fl t Ar type
 .Nm
 .Op Fl dfruvw
 .Ar special | node
 .Nm
 @@ -212,26 +212,32 @@ Do not allow set-user-identifier or set-
 .It Cm rdonly
 The same as
 .Fl r ;
 mount the file system read-only (even the super-user may not write it).
 .It Cm reload
 Reload all incore data for a file system.
 This is used mainly after running
 .Xr fsck 8
 on the root file system and finding things to fix.
 The file system must be mounted read-only.
 All cached meta-data are invalidated, superblock and summary information
 is re-read from disk, all cached inactive vnodes and file data are
 invalidated and all inode data are re-read for all active vnodes.
 .It Cm rump
 Instead of running mount_type to mount the file system, run rump_type.
 This uses a userspace server to mount the file system and does not
 require kernel support for the specific file system type.  See the
 .Fl t
 flag and respective rump_type manual page for more information.
 .It Cm softdep
 (FFS only) Mount the file system using soft dependencies.
 This means that metadata will not be written immediately,
 but is written in an ordered fashion to keep the
 on-disk state of the file system consistent.
 This results in significant speedups for file create/delete operations.
 This option will be ignored when using the
 .Fl u
 flag and a file system is already mounted read/write.
 This option has gone through moderate to heavy testing,
 but should still be used with care.
 A file system mounted with
 .Cm softdep
 @@ -480,19 +486,31 @@ mount -t cd9660 -o nodev,nosuid /dev/cd0
 .Xr mount_lfs 8 ,
 .Xr mount_mfs 8 ,
 .Xr mount_msdos 8 ,
 .Xr mount_nfs 8 ,
 .Xr mount_ntfs 8 ,
 .Xr mount_null 8 ,
 .Xr mount_overlay 8 ,
 .Xr mount_portal 8 ,
 .Xr mount_procfs 8 ,
 .Xr mount_tmpfs 8 ,
 .Xr mount_udf 8 ,
 .Xr mount_umap 8 ,
 .Xr mount_union 8 ,
 .Xr rump_cd9660 8 ,
 .Xr rump_efs 8 ,
 .Xr rump_ext2fs 8 ,
 .Xr rump_ffs 8 ,
 .Xr rump_hfs 8 ,
 .Xr rump_lfs 8 ,
 .Xr rump_msdos 8 ,
 .Xr rump_nfs 8 ,
 .Xr rump_ntfs 8 ,
 .Xr rump_sysvbfs 8 ,
 .Xr rump_tmpfs 8 ,
 .Xr rump_udf 8 ,
 .Xr umount 8
 .Sh HISTORY
+A
 .Nm
 command appeared in
 .At v6 .

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mount.c,v 1.86.2.1 2009/01/16 22:22:52 bouyer Exp $	*/
+/*	$NetBSD: mount.c,v 1.86.2.2 2009/01/22 20:27:59 snj Exp $	*/
 /*
  * Copyright (c) 1980, 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1989, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)mount.c	8.25 (Berkeley) 5/8/95";
 #else
-__RCSID("$NetBSD: mount.c,v 1.86.2.1 2009/01/16 22:22:52 bouyer Exp $");
+__RCSID("$NetBSD: mount.c,v 1.86.2.2 2009/01/22 20:27:59 snj Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
 #include <err.h>
 #include <errno.h>
 #include <fstab.h>
 #include <pwd.h>
 #include <signal.h>
 #include <stdio.h>
 @@ -420,27 +420,30 @@ mountfs(const char *vfstype, const char
 	if (flags & MNT_UPDATE) {
 		catopt(&optbuf, "update");
 		/* Figure out the fstype only if we defaulted to ffs */
 		if (vfstype == ffs_fstype && statvfs(name, &sf) != -1)
 			vfstype = sf.f_fstypename;
+	}
 	maxargc = 64;
 	argv = malloc(sizeof(char *) * maxargc);
 	if (argv == NULL)
 		err(1, "malloc");
-	(void) snprintf(execbase, sizeof(execbase), "mount_%s", vfstype);
+	if (hasopt(optbuf, "rump"))
 		(void)snprintf(execbase, sizeof(execbase), "rump_%s", vfstype);
 	else
 		(void)snprintf(execbase, sizeof(execbase), "mount_%s", vfstype);
 	argc = 0;
 	argv[argc++] = execbase;
 	if (optbuf)
 		mangle(optbuf, &argc, &argv, &maxargc);
 	argv[argc++] = spec;
 	argv[argc++] = name;
 	argv[argc] = NULL;
 	if ((verbose && buf == NULL) || debug) {
 		(void)printf("exec:");
 		for (i = 0; i < argc; i++)
 			(void)printf(" %s", argv[i]);
 		(void)printf("\n");