Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/include/mntopts.h,v
rcsdiff: /ftp/cvs/cvsroot/src/include/mntopts.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.5.2.1
retrieving revision 1.13
diff -u -p -r1.5.2.1 -r1.13
--- src/include/mntopts.h	2005/12/29 00:57:09	1.5.2.1
+++ src/include/mntopts.h	2009/01/12 18:14:20	1.13
@@ -1,4 +1,4 @@
-/*	$NetBSD: mntopts.h,v 1.5.2.1 2005/12/29 00:57:09 riz Exp $	*/
+/*	$NetBSD: mntopts.h,v 1.13 2009/01/12 18:14:20 pooka Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -55,8 +55,8 @@ struct mntopt {
 #define MOPT_NOATIME		{ "atime",	1, MNT_NOATIME, 0 }
 #define MOPT_SYMPERM		{ "symperm",	0, MNT_SYMPERM, 0 }
 #define MOPT_SOFTDEP		{ "softdep",	0, MNT_SOFTDEP, 0 }
+#define MOPT_LOG		{ "log",	0, MNT_LOG, 0 }
 #define MOPT_IGNORE		{ "hidden",	0, MNT_IGNORE, 0 }
-#define	MOPT_MAGICLINKS		{ "magiclinks",	0, MNT_MAGICLINKS, 0 }
 
 /* Control flags. */
 #define MOPT_FORCE		{ "force",	0, MNT_FORCE, 0 }
@@ -70,6 +70,8 @@ struct mntopt {
 
 /* 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,							\
@@ -89,7 +91,7 @@ struct mntopt {
 	MOPT_UNION,							\
 	MOPT_IGNORE,							\
 	MOPT_SYMPERM,							\
-	MOPT_MAGICLINKS
+	MOPT_RUMP
 
 __BEGIN_DECLS
 typedef struct mntoptparse *mntoptparse_t;