From 2708aea474cff0629c2a480bb4bf148ad878ac47 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Thu, 6 Aug 2009 00:05:23 +0200 Subject: [PATCH] Remove some devices.conf(5) and MAKEDEV(8) related stuff. devices.conf(5) functionality will likely be replaced by running devfsctl on startup. --- Makefile_upgrade.inc | 4 + etc/Makefile | 2 +- etc/devices.conf | 18 ---- share/examples/etc/README.examples | 1 - share/man/man5/Makefile | 1 - share/man/man5/devices.conf.5 | 124 -------------------------- share/man/man8/man8.i386/MAKEDEV.8 | 138 ----------------------------- share/man/man8/man8.i386/Makefile | 1 - 8 files changed, 5 insertions(+), 284 deletions(-) delete mode 100644 etc/devices.conf delete mode 100644 share/man/man5/devices.conf.5 delete mode 100644 share/man/man8/man8.i386/MAKEDEV.8 diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 4ebed92859..ebd2168d16 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -1135,3 +1135,7 @@ TO_REMOVE+=/usr/share/man/cat9/suser.9.gz TO_REMOVE+=/usr/share/man/man9/suser.9.gz TO_REMOVE+=/usr/share/man/cat9/suser_cred.9.gz TO_REMOVE+=/usr/share/man/man9/suser_cred.9.gz +TO_REMOVE+=/usr/share/man/cat5/devices.conf.5.gz +TO_REMOVE+=/usr/share/man/man5/devices.conf.5.gz +TO_REMOVE+=/usr/share/man/cat8/MAKEDEV.8.gz +TO_REMOVE+=/usr/share/man/man8/MAKEDEV.8.gz diff --git a/etc/Makefile b/etc/Makefile index f149375f82..ce2e7eb76c 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -26,7 +26,7 @@ BINUPDATE+=${.CURDIR}/../usr.bin/mail/misc/mail.rc \ # BIN1= amd.map auth.conf \ crontab csh.cshrc csh.login csh.logout \ - devd.conf devices.conf dhclient.conf dm.conf dntpd.conf \ + devd.conf dhclient.conf dm.conf dntpd.conf \ ftpusers group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ diff --git a/etc/devices.conf b/etc/devices.conf deleted file mode 100644 index 5432d72541..0000000000 --- a/etc/devices.conf +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################## -# -# Local device ownership and permissions configuration file, used -# by MAKEDEV(8). -# -# See the devices.conf(5) man page for more information on how to override -# device node ownership and/or permissions, and the general format of this -# file. -# -# $DragonFly: src/etc/devices.conf,v 1.1 2005/03/22 00:40:52 dillon Exp $ -# -############################################################################## - - -# In conjunction with a tape autochanger device, the bacula-sd storage daemon -# (belonging to the operator group) needs read and write access to /dev/pass0. -# It won't be able to change tapes, load/unload slots, etc. otherwise. -#pass0 root:operator 660 # MAKEDEV(8) default is 600 diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples index d2bf37f40f..ece717548d 100644 --- a/share/examples/etc/README.examples +++ b/share/examples/etc/README.examples @@ -20,7 +20,6 @@ crontab - system scheduled command table csh.cshrc - system-wide .cshrc for csh(1) csh.login - system-wide .login for csh(1) csh.logout - system-wide .logout for csh(1) -devices.conf - ownership and permission for device nodes dhclient.conf - DHCP client configuration file disktab - disk description file dm.conf - configuration file for games (see dm(6)) diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index 2ec1fc675e..b8315db30d 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -7,7 +7,6 @@ MAN= acct.5 \ a.out.5 \ compilers.conf.5 \ core.5 \ - devices.conf.5 \ dir.5 \ disktab.5 \ elf.5 \ diff --git a/share/man/man5/devices.conf.5 b/share/man/man5/devices.conf.5 deleted file mode 100644 index 1c43194478..0000000000 --- a/share/man/man5/devices.conf.5 +++ /dev/null @@ -1,124 +0,0 @@ -.\" Copyright (c) 2005 Joerg Anslik -.\" All rights reserved. -.\" -.\" 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. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. -.\" -.\" $DragonFly: src/share/man/man5/devices.conf.5,v 1.4 2008/09/06 10:23:39 thomas Exp $ -.\" -.\" Note: The date here should be updated whenever a non-trivial -.\" change is made to the manual page. -.Dd March 18, 2005 -.Dt DEVICES.CONF 5 -.Os -.Sh NAME -.Nm devices.conf -.Nd override ownership and permissions for device nodes -.Sh SYNOPSIS -.Pa /etc/devices.conf -.Sh DESCRIPTION -The -.Nm -file is used by the -.Xr MAKEDEV 8 -shell script. -Normally, -.Xr MAKEDEV 8 -creates any special -file (device node) with reasonable ownership and permissions. To override these default -settings, you can put corresponding entries in your -.Pa devices.conf -file, so -.Xr MAKEDEV 8 -will use these when it creates the special file. -.Pp -This feature comes in handy if you're using (e.g.) tape backup software like -.Pa bacula -in conjunction with a tape autochanger device. In this case, the -.Dq bacula-sd -storage daemon needs read/write access to -.Pa /dev/pass? , -which is not granted by default -when -.Xr MAKEDEV 8 -creates the -.Pa pass? -device node. -.Pp -So, instead of manually changing the permissions of /dev/pass? after each -.Dq make upgrade , -you can simply put a local override entry into -.Pa devices.conf , -so the device node will have the new permissions the next time -.Xr MAKEDEV 8 -creates it. -.Sh FILE FORMAT -The contents of the -.Nm -file is plain ASCII and can be modified with the -text editor of your choice. -Lines with a -.Ql # -in the first column are comments and are ignored, which also holds true -for blank lines. -.Pp -A configuration line consists of up to four fields separated -by whitespace. The first three fields are mandatory, and contain the name of the device -node to be overridden, the ownership in -.Dq owner:group -format and the new file permissions. The fourth field is optional and -reserved for comments (or whatever). -.Pp -Due to the huge number of device nodes that -.Xr MAKEDEV 8 -can create, -the first field (the device node name) may contain the -.Ql * -wildcard character, if the new ownership/permissions should apply to an entire -device family (see -.Sx EXAMPLES ) . -.Sh FILES -.Bl -tag -width ".Pa /etc/devices.conf" -.It Pa /etc/devices.conf -The local device permissions override file -.El -.Sh EXAMPLES -The following is an example of how to set up local overrides for some -device nodes. -.Bd -literal -# Grant read and write permission on /dev/pass0 to the bacula-sd, -# which belongs to the operator group. -pass0 root:operator 660 - -# Change ownership and permissions for the entire ad0 device family -ad0* root:man 640 - -# Grant read and write access to sa* control nodes to everyone -sa*.ctl root:wheel 666 - -# Change ownership and permissions for device node "4" in /dev/fd -fd/4 ihate:floppies 000 - -# Grant mommy write access to my fridge -fridge mommy:supplies 640 # Will be ignored by MAKEDEV(8)... -.Ed -.Sh SEE ALSO -.Xr MAKEDEV 8 diff --git a/share/man/man8/man8.i386/MAKEDEV.8 b/share/man/man8/man8.i386/MAKEDEV.8 deleted file mode 100644 index 97fc90f936..0000000000 --- a/share/man/man8/man8.i386/MAKEDEV.8 +++ /dev/null @@ -1,138 +0,0 @@ -.\" Copyright (c) 1991, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" 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. -.\" -.\" 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. -.\" -.\" @(#)MAKEDEV.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man8/man8.i386/MAKEDEV.8,v 1.15.2.5 2002/05/11 06:15:16 dd Exp $ -.\" $DragonFly: src/share/man/man8/man8.i386/MAKEDEV.8,v 1.11 2008/09/06 10:36:27 thomas Exp $ -.\" -.Dd June 5, 1993 -.Dt MAKEDEV 8 i386 -.Os -.Sh NAME -.Nm MAKEDEV -.Nd create system and device special files -.Sh SYNOPSIS -.Nm -name ... -.Sh DESCRIPTION -The shell script -.Nm -found in the -.Dq Pa /dev -directory, is used to create the common special files. -See -.Xr intro 4 -for a more complete discussion of special files. -.Pp -.Nm -takes any number of device names as arguments, where the names are -the common abbreviation for the device. -There are two special devices, -.Dq std -and -.Dq local . -The former creates the standard devices for the architecture. -The latter is for devices specific to the local site, and -executes the shell file -.Dq Pa MAKEDEV.local . -.Pp -The i386 supports the following devices. -Where a device name is followed by a hash sign -.Pq Dq # , -the hash sign -must be replaced by a unit number. -.Bl -tag -width indent -.It std -the standard devices (console, fd/*, klog, kmem, mem, null, -stderr, stdin, stdout, tty) -.It local -configuration specific devices -.It tty# -standard PC COM ports -.It fd# -.Dq floppy -disk drives (3 \(12", 5 \(14") -.It pty# -set of 32 master and slave pseudo terminals -.It da# -SCSI disk drives -.It sa# -SCSI tape drives -.It ch# -SCSI changer devices -.It ses# -SCSI SES/SAF-TE environmental devices -.It vty# -set of 12 virtual console devices for -.Xr syscons 4 -.It ad# -.Dq ATAPI -disk drives (IDE). -.It ast# -.Dq ATAPI -tape drives. -.It acd# -.Dq ATAPI -CDROM drives. -.El -.Pp -.Nm -creates each special file with reasonable default ownership and permissions. -Under -.Dx , -you can change these default settings by putting -.Dq local override -entries in the -.Pa /etc/devices.conf -file. -.Pp -Whenever -.Nm -finds overrides for a given special file in -.Pa /etc/devices.conf , -it will use these settings when it creates the device node. -.Pp -See -.Xr devices.conf 5 -for more information on how to override the default settings. -.Sh FILES -.Bl -tag -width /dev/xxxx -compact -.It Pa /dev -The special file directory. -.It Pa /etc/devices.conf -File containing local ownership and permissions overrides. -.El -.Sh SEE ALSO -.Xr intro 4 , -.Xr nata 4 , -.Xr devices.conf 5 , -.Xr config 8 , -.Xr mknod 8 diff --git a/share/man/man8/man8.i386/Makefile b/share/man/man8/man8.i386/Makefile index 9287cdb521..bafe27f979 100644 --- a/share/man/man8/man8.i386/Makefile +++ b/share/man/man8/man8.i386/Makefile @@ -2,7 +2,6 @@ # $FreeBSD: src/share/man/man8/man8.i386/Makefile,v 1.7.2.2 2001/04/25 11:11:34 ru Exp $ # $DragonFly: src/share/man/man8/man8.i386/Makefile,v 1.2 2003/06/17 04:37:01 dillon Exp $ -MAN= MAKEDEV.8 MANSUBDIR=/i386 .include -- 2.41.0