aboutsummaryrefslogtreecommitdiff
path: root/sbin/devfs
diff options
context:
space:
mode:
Diffstat (limited to 'sbin/devfs')
-rw-r--r--sbin/devfs/Makefile1
-rw-r--r--sbin/devfs/devfs.816
-rw-r--r--sbin/devfs/devfs.c1
-rw-r--r--sbin/devfs/devfs.rules2
-rw-r--r--sbin/devfs/rule.c1
5 files changed, 7 insertions, 14 deletions
diff --git a/sbin/devfs/Makefile b/sbin/devfs/Makefile
index dc823abcaf18..0a20cee8241c 100644
--- a/sbin/devfs/Makefile
+++ b/sbin/devfs/Makefile
@@ -1,4 +1,3 @@
-
CONFS= devfs.conf devfs.rules
CONFSDIR_devfs.rules= /etc/defaults
CONFSMODE_devfs.rules= 600
diff --git a/sbin/devfs/devfs.8 b/sbin/devfs/devfs.8
index af777fe8947f..bbe4825b8bb2 100644
--- a/sbin/devfs/devfs.8
+++ b/sbin/devfs/devfs.8
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd December 1, 2020
+.Dd October 18, 2023
.Dt DEVFS 8
.Os
.Sh NAME
@@ -38,7 +38,7 @@
The
.Nm
utility provides an interface to manipulate properties of
-.Xr devfs 5
+.Xr devfs 4
mounts.
.Pp
The rules, by default as configured by
@@ -64,7 +64,7 @@ The following flags are common to all keywords:
Operate on
.Ar mount-point ,
which is expected to be a
-.Xr devfs 5
+.Xr devfs 4
mount.
If this option is not specified,
.Nm
@@ -73,7 +73,7 @@ operates on
.El
.Ss Rule Subsystem
The
-.Xr devfs 5
+.Xr devfs 4
rule subsystem provides a way for the administrator of a system to control
the attributes of DEVFS nodes.
.\" XXX devfs node? entry? what?
@@ -248,7 +248,7 @@ will return the same information regardless of the mount-point specified with
The mount-point is only relevant when changing what its current ruleset is
or when using one of the apply commands.
.Sh FILES
-.Bl -tag -width "Pa /usr/share/examples/etc/devfs.conf" -compact
+.Bl -tag -width "Pa /etc/defaults/devfs.rules" -compact
.It Pa /etc/defaults/devfs.rules
Default
.Nm
@@ -264,10 +264,6 @@ with the same ruleset number, otherwise the two files are effectively merged.
Boot-time
.Nm
configuration file.
-.It Pa /usr/share/examples/etc/devfs.conf
-Example boot-time
-.Nm
-configuration file.
.El
.Sh EXAMPLES
When the system boots,
@@ -376,7 +372,7 @@ this feature can be used to copy rulesets:
.Xr chmod 1 ,
.Xr jail 2 ,
.Xr glob 3 ,
-.Xr devfs 5 ,
+.Xr devfs 4 ,
.Xr devfs.conf 5 ,
.Xr devfs.rules 5 ,
.Xr chown 8 ,
diff --git a/sbin/devfs/devfs.c b/sbin/devfs/devfs.c
index 72feed7fb857..ae8954e9d88b 100644
--- a/sbin/devfs/devfs.c
+++ b/sbin/devfs/devfs.c
@@ -30,7 +30,6 @@
* DEVFS control.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/queue.h>
diff --git a/sbin/devfs/devfs.rules b/sbin/devfs/devfs.rules
index f85940aaa7dd..c51672815e64 100644
--- a/sbin/devfs/devfs.rules
+++ b/sbin/devfs/devfs.rules
@@ -1,5 +1,5 @@
#
-# The following are some default rules for devfs(5) mounts.
+# The following are some default rules for devfs(4) mounts.
# The format is very simple. Empty lines and lines beginning
# with a hash '#' are ignored. If the hash mark occurs anywhere
# other than the beginning of a line, it and any subsequent
diff --git a/sbin/devfs/rule.c b/sbin/devfs/rule.c
index b9b493ae3742..d07104d1de13 100644
--- a/sbin/devfs/rule.c
+++ b/sbin/devfs/rule.c
@@ -30,7 +30,6 @@
* Rule subsystem manipulation.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/conf.h>
#include <sys/ioctl.h>