From 36647362c7ae7dc360a692db03473b68db996bba Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Mon, 29 Nov 2004 09:35:01 +0000
Subject: [PATCH] Fix the mount(8) status reporting, now that MNT_NODEV is a
no-op (zero).
Asked to commit by: phk
---
sbin/mount/mntopts.h | 2 --
sbin/mount/mount.8 | 8 +-------
sbin/mount/mount.c | 2 --
sbin/mount_std/mount_std.8 | 3 +--
4 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 5205195fd3f1..0e229446c0a9 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h
@@ -40,7 +40,6 @@ struct mntopt {
/* User-visible MNT_ flags. */
#define MOPT_ASYNC { "async", 0, MNT_ASYNC, 0 }
#define MOPT_NOATIME { "atime", 1, MNT_NOATIME, 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_NOSYMFOLLOW { "symfollow", 1, MNT_NOSYMFOLLOW, 0 }
@@ -76,7 +75,6 @@ struct mntopt {
MOPT_GROUPQUOTA, \
MOPT_FSTAB_COMPAT, \
MOPT_NOATIME, \
- MOPT_NODEV, \
MOPT_NOEXEC, \
MOPT_SUIDDIR, /* must be before MOPT_NOSUID */ \
MOPT_NOSUID, \
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 02c8e40ef08d..b540f932f313 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -28,7 +28,7 @@
.\" @(#)mount.8 8.8 (Berkeley) 6/16/94
.\" $FreeBSD$
.\"
-.Dd April 7, 2003
+.Dd November 26, 2004
.Dt MOUNT 8
.Os
.Sh NAME
@@ -177,12 +177,6 @@ flag.
Disable read clustering.
.It Cm noclusterw
Disable write clustering.
-.It Cm nodev
-Do not interpret character or block special devices on the file system.
-This option is useful for a server that has file systems containing
-special devices for architectures other than its own.
-This option is set automatically when the user does not have super-user
-privileges.
.It Cm noexec
Do not allow execution of any binaries on the mounted file system.
This option is useful for a server that has file systems containing
diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c
index df97adbb88f8..cecf347b2c9a 100644
--- a/sbin/mount/mount.c
+++ b/sbin/mount/mount.c
@@ -93,7 +93,6 @@ static struct opt {
{ MNT_EXPORTED, "NFS exported" },
{ MNT_LOCAL, "local" },
{ MNT_NOATIME, "noatime" },
- { MNT_NODEV, "nodev" },
{ MNT_NOEXEC, "noexec" },
{ MNT_NOSUID, "nosuid" },
{ MNT_NOSYMFOLLOW, "nosymfollow" },
@@ -750,7 +749,6 @@ flags2opts(flags)
if (flags & MNT_SYNCHRONOUS) res = catopt(res, "sync");
if (flags & MNT_NOEXEC) res = catopt(res, "noexec");
if (flags & MNT_NOSUID) res = catopt(res, "nosuid");
- if (flags & MNT_NODEV) res = catopt(res, "nodev");
if (flags & MNT_UNION) res = catopt(res, "union");
if (flags & MNT_ASYNC) res = catopt(res, "async");
if (flags & MNT_NOATIME) res = catopt(res, "noatime");
diff --git a/sbin/mount_std/mount_std.8 b/sbin/mount_std/mount_std.8
index 86284d6dab5e..3a4df0fb2837 100644
--- a/sbin/mount_std/mount_std.8
+++ b/sbin/mount_std/mount_std.8
@@ -32,7 +32,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 13, 1996
+.Dd November 26, 2004
.Dt MOUNT_STD 8
.Os
.Sh NAME
@@ -70,7 +70,6 @@ accepts only the standard
options
.Dq ro ,
.Dq rw ,
-.Dq nodev ,
.Dq noexec ,
.Dq nosuid ,
and