BSD 4_4_Lite1 release

[unix-history] / usr / src / sbin / mount / mntopts.h

diff --git a/usr/src/sbin/mount/mntopts.h b/usr/src/sbin/mount/mntopts.h
index 43155a6..a89f63d 100644 (file)
--- a/usr/src/sbin/mount/mntopts.h
+++ b/usr/src/sbin/mount/mntopts.h
@@ -2,9 +2,35 @@
  * Copyright (c) 1994
  *      The Regents of the University of California.  All rights reserved.
  *
  * Copyright (c) 1994
  *      The Regents of the University of California.  All rights reserved.
  *

- * %sccs.include.redist.c%
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)mntopts.h   8.1 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * 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.
+ *
+ *     @(#)mntopts.h   8.3 (Berkeley) 3/27/94

  */
 
 struct mntopt {
  */
 
 struct mntopt {


@@ -14,21 +40,21 @@ struct mntopt {
 };
 
 /* User-visible MNT_ flags. */
 };
 
 /* User-visible MNT_ flags. */

-#define MOPT_ASYNC             { "async",       0, MNT_ASYNC }
-#define MOPT_NODEV             { "dev",         1, MNT_NODEV }
-#define MOPT_NOEXEC            { "exec",        1, MNT_NOEXEC }
-#define MOPT_NOSUID            { "suid",        1, MNT_NOSUID }
-#define MOPT_RDONLY            { "rdonly",      0, MNT_RDONLY }
-#define MOPT_SYNCHRONOUS       { "synchronous", 0, MNT_SYNCHRONOUS }
-#define MOPT_UNION             { "union",       0, MNT_UNION }
+#define MOPT_ASYNC             { "async",      0, MNT_ASYNC }
+#define MOPT_NODEV             { "dev",        1, MNT_NODEV }
+#define MOPT_NOEXEC            { "exec",       1, MNT_NOEXEC }
+#define MOPT_NOSUID            { "suid",       1, MNT_NOSUID }
+#define MOPT_RDONLY            { "rdonly",     0, MNT_RDONLY }
+#define MOPT_SYNC              { "sync",       0, MNT_SYNCHRONOUS }
+#define MOPT_UNION             { "union",      0, MNT_UNION }

 
 /* Control flags. */
 
 /* Control flags. */

-#define MOPT_FORCE             { "exec",        1, MNT_FORCE }
-#define MOPT_UPDATE            { "update",      0, MNT_UPDATE }
+#define MOPT_FORCE             { "force",      1, MNT_FORCE }
+#define MOPT_UPDATE            { "update",     0, MNT_UPDATE }

 
 /* Support for old-style "ro", "rw" flags. */
 
 /* Support for old-style "ro", "rw" flags. */

-#define MOPT_RO                        { "ro",          0, MNT_RDONLY }
-#define MOPT_RW                        { "rw",          1, MNT_RDONLY }
+#define MOPT_RO                        { "ro",         0, MNT_RDONLY }
+#define MOPT_RW                        { "rw",         1, MNT_RDONLY }

 
 #define MOPT_FSTAB_COMPAT                                              \
        MOPT_RO,                                                        \
 
 #define MOPT_FSTAB_COMPAT                                              \
        MOPT_RO,                                                        \