aboutsummaryrefslogtreecommitdiff
path: root/sbin/mount/mntopts.h
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1997-03-11 12:28:00 +0000
committerPeter Wemm <peter@FreeBSD.org>1997-03-11 12:28:00 +0000
commitc06fe0a05e6348d700e4941d30aadcdacef5d829 (patch)
treef705d4552806debc8fb516ed868872bafc3e0ddd /sbin/mount/mntopts.h
parente7b6972097226a9eea20da0477d0147a9d5d5e3e (diff)
downloadsrc-c06fe0a05e6348d700e4941d30aadcdacef5d829.tar.gz
src-c06fe0a05e6348d700e4941d30aadcdacef5d829.zip
Merge from Lite2
- use new getvfsbyname() interface and mount(2) interface **DANGER WILL ROBINSON!!** You must be running a -current kernel from within a week or so in order for this to work!
Notes
Notes: svn path=/head/; revision=23678
Diffstat (limited to 'sbin/mount/mntopts.h')
-rw-r--r--sbin/mount/mntopts.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 032d70ed5316..8ca12603d771 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -30,48 +30,48 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * @(#)mntopts.h 8.3 (Berkeley) 3/27/94
+ * @(#)mntopts.h 8.7 (Berkeley) 3/29/95
*/
struct mntopt {
const char *m_option; /* option name */
int m_inverse; /* if a negative option, eg "dev" */
int m_flag; /* bit to set, eg. MNT_RDONLY */
- int m_altloc; /* zero if this is a real mount flag */
+ int m_altloc; /* 1 => set bit in altflags */
};
/* User-visible MNT_ flags. */
#define MOPT_ASYNC { "async", 0, MNT_ASYNC, 0 }
#define MOPT_NOATIME { "atime", 1, MNT_NOATIME, 0 }
-#define MOPT_NOAUTO { "auto", 1, 0, 0 }
#define MOPT_NODEV { "dev", 1, MNT_NODEV, 0 }
#define MOPT_NOEXEC { "exec", 1, MNT_NOEXEC, 0 }
#define MOPT_NOSUID { "suid", 1, MNT_NOSUID, 0 }
#define MOPT_RDONLY { "rdonly", 0, MNT_RDONLY, 0 }
#define MOPT_SYNC { "sync", 0, MNT_SYNCHRONOUS, 0 }
#define MOPT_UNION { "union", 0, MNT_UNION, 0 }
-
-/* Skip this options without any action (needed for checkquota/quotaon) */
-#define MOPT_UQUOTA { "userquota", 0, 0, 0 }
-#define MOPT_GQUOTA { "groupquota", 0, 0, 0 }
+#define MOPT_USERQUOTA { "userquota", 0, 0, 0 }
+#define MOPT_GROUPQUOTA { "groupquota", 0, 0, 0 }
/* Control flags. */
#define MOPT_FORCE { "force", 0, MNT_FORCE, 0 }
#define MOPT_UPDATE { "update", 0, MNT_UPDATE, 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_FSTAB_COMPAT \
MOPT_RO, \
- MOPT_RW
+ MOPT_RW, \
+ MOPT_AUTO
/* Standard options which all mounts can understand. */
#define MOPT_STDOPTS \
+ MOPT_USERQUOTA, \
+ MOPT_GROUPQUOTA, \
MOPT_FSTAB_COMPAT, \
MOPT_NOATIME, \
- MOPT_NOAUTO, \
MOPT_NODEV, \
MOPT_NOEXEC, \
MOPT_NOSUID, \