Remove usbd(8) and all references to it. It is no longer necessary

since devd(8) now provides the same functionality.

Submitted by:	Anish Mistry
This commit is contained in:
iedowse 2005-12-15 01:04:51 +00:00
parent a7aeead21d
commit 0b71e714c9
32 changed files with 15 additions and 1597 deletions

View File

@ -14,6 +14,11 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
# 20051214: usbd(8) removed
OLD_FILES+=etc/rc.d/usbd
OLD_FILES+=etc/usbd.conf
OLD_FILES+=usr/sbin/usbd
OLD_FILES+=usr/share/man/man8/usbd.8.gz
# 20051029: rc.d/ppp-user renamed to rc.d/ppp for convenience
OLD_FILES+=etc/rc.d/ppp-user
# 20051012: setkey(8) moved to /sbin/

View File

@ -15,7 +15,7 @@ BIN1= amd.map apmd.conf auth.conf \
rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
rc.sendmail rc.shutdown \
rc.subr remote rpc services shells \
snmpd.config sysctl.conf syslog.conf usbd.conf \
snmpd.config sysctl.conf syslog.conf \
etc.${MACHINE_ARCH}/ttys \
${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
${.CURDIR}/../usr.bin/mail/misc/mail.rc \

View File

@ -475,8 +475,6 @@ lpd_program="/usr/sbin/lpd" # path to lpd, if you want a different one.
lpd_flags="" # Flags to lpd (if enabled).
chkprintcap_enable="NO" # Run chkprintcap(8) before running lpd.
chkprintcap_flags="-d" # Create missing directories by default.
usbd_enable="NO" # Run the usbd daemon.
usbd_flags="" # Flags to usbd (if enabled).
dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO).
dumpdir="/var/crash" # Directory where crash dumps are to be stored
savecore_flags="" # Used if dumpdev is enabled above, and present.

View File

@ -35,7 +35,7 @@ FILES= DAEMON LOGIN NETWORKING SERVERS \
serial sppp swap1 \
syscons sysctl syslogd \
timed tmp \
ugidfw usbd \
ugidfw \
var virecover \
watchdogd wpa_supplicant \
ypbind yppasswdd ypserv \

View File

@ -28,7 +28,7 @@
#
# PROVIDE: syscons
# REQUIRE: LOGIN usbd
# REQUIRE: LOGIN
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -1,18 +0,0 @@
#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: usbd
# REQUIRE: DAEMON
# BEFORE: LOGIN
# KEYWORD: nojail
. /etc/rc.subr
name="usbd"
rcvar=`set_rcvar`
command="/usr/sbin/${name}"
load_rc_config $name
run_rc_command "$1"

View File

@ -1,10 +0,0 @@
# Configuration file the USB daemon.
#
# See usbd.conf(5) for the description of the format of the file.
#
# $FreeBSD$
# The fallthrough entry: Nothing is specified, nothing is done. And it isn't
# necessary at all :-). Just for pretty printing in debugging mode.
#
device "USB device"

View File

@ -38,7 +38,6 @@ srcdirs /usr/src/usr.sbin
progs arp
progs ppp
progs sysinstall
progs usbd
progs usbdevs
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph

View File

@ -38,7 +38,6 @@ srcdirs /usr/src/usr.sbin
progs arp
progs ppp
progs sysinstall
progs usbd
progs usbdevs
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph

View File

@ -38,7 +38,6 @@ srcdirs /usr/src/usr.sbin
progs arp
progs ppp
progs sysinstall
progs usbd
progs usbdevs
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph

View File

@ -40,7 +40,6 @@ srcdirs /usr/src/usr.sbin
progs arp
progs ppp
progs sysinstall
progs usbd
progs usbdevs
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph

View File

@ -40,7 +40,6 @@ srcdirs /usr/src/usr.sbin
progs arp
progs ppp
progs sysinstall
progs usbd
progs usbdevs
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph

View File

@ -38,7 +38,6 @@ srcdirs /usr/src/usr.sbin
progs arp
progs ppp
progs sysinstall
progs usbd
progs usbdevs
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph

View File

@ -139,7 +139,7 @@
#NO_SHAREDOCS= # do not build the 4.4BSD legacy docs
#NO_TCSH= # do not build and install /bin/csh (which is tcsh)
#NO_TOOLCHAIN= # do not build programs for program development
#NO_USB= # do not build usbd(8) and related programs
#NO_USB= # do not build USB-related programs
#
# Variables that control how ppp(8) is built.
#PPP_NO_NAT= # do not build with NAT support (see make.conf(5))

View File

@ -409,7 +409,6 @@ specifications can be found at:
.Xr urio 4 ,
.Xr uscanner 4 ,
.Xr uvscom 4 ,
.Xr usbd 8 ,
.Xr usbdevs 8
.Sh HISTORY
The

View File

@ -41,8 +41,8 @@ and running, e.g.\& USB devices.
See
.Xr devfs.rules 5
for setting ownership and permissions for all device nodes, and
.Xr usbd.conf 5
for actions to be taken when USB devices are attached or detached.
.Xr devd.conf 5
for actions to be taken when devices are attached or detached.
.Pp
Lines starting with a hash sign
.Pq Ql #
@ -133,7 +133,7 @@ perm cd0 0660
.Xr chmod 1 ,
.Xr devfs 5 ,
.Xr devfs.rules 5 ,
.Xr usbd.conf 5 ,
.Xr devd.conf 5 ,
.Xr chown 8
.Sh AUTHORS
This manual page was written by

View File

@ -704,9 +704,7 @@ programs used for program development,
compilers, debuggers etc.
.It Va NO_USB
.Pq Vt bool
Set to not build
.Xr usbd 8
and related programs.
Set to not build USB-related programs and libraries.
.It Va PPP_NO_NAT
.Pq Vt bool
Build

View File

@ -2854,22 +2854,6 @@ is set to
these are the flags to pass to the
.Xr sshd 8
daemon.
.It Va usbd_enable
.Pq Vt bool
If set to
.Dq Li YES ,
run the
.Xr usbd 8
daemon at boot time.
.It Va usbd_flags
.Pq Vt str
If
.Va usbd_enable
is set to
.Dq Li YES ,
these are the flags passed to the
.Xr usbd 8
daemon.
.It Va watchdogd_enable
.Pq Vt bool
If set to
@ -3461,7 +3445,6 @@ device and the mount point will be changed.
.Xr sysctl 8 ,
.Xr syslogd 8 ,
.Xr timed 8 ,
.Xr usbd 8 ,
.Xr yp 8 ,
.Xr ypbind 8 ,
.Xr ypserv 8 ,

View File

@ -169,7 +169,6 @@ SUBDIR= ac \
trpt \
tzsetup \
ugidfw \
${_usbd} \
${_usbdevs} \
vidcontrol \
vipw \
@ -255,7 +254,6 @@ _sendmail= sendmail
.endif
.if !defined(NO_USB)
_usbd= usbd
_usbdevs= usbdevs
.endif

View File

@ -11,7 +11,7 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \
ftp.c globals.c http.c index.c install.c installUpgrade.c keymap.c \
label.c main.c makedevs.c media.c menus.c misc.c modules.c \
mouse.c msg.c network.c nfs.c options.c package.c \
system.c tape.c tcpip.c termcap.c ttys.c ufs.c usb.c user.c \
system.c tape.c tcpip.c termcap.c ttys.c ufs.c user.c \
variable.c ${_wizard} keymap.h
CFLAGS+= -DUSE_GZIP=1

View File

@ -120,12 +120,6 @@ main(int argc, char **argv)
}
#endif
/* Initialize USB, if we haven't already done so. */
if (!pvariable_get("usbInitialize")) {
usbInitialize();
pvariable_set("usbInitialize=1");
}
/* Probe for all relevant devices on the system */
deviceGetAll();

View File

@ -1372,10 +1372,6 @@ DMenu MenuStartup = {
{ " pccard ifconfig", "List of PCCARD ethernet devices to configure",
dmenuVarCheck, dmenuISetVariable, NULL, "pccard_ifconfig" },
#endif
{ " usbd", "Enable USB daemon (detect USB attach / detach)",
dmenuVarCheck, dmenuToggleVariable, NULL, "usbd_enable=YES" },
{ " usbd flags", "Set default flags to usbd (if enabled)",
dmenuVarCheck, dmenuISetVariable, NULL, "usbd_flags" },
{ " ", " -- ", NULL, NULL, NULL, NULL, ' ', ' ', ' ' },
{ " Startup dirs", "Set the list of dirs to look for startup scripts",
dmenuVarCheck, dmenuISetVariable, NULL, "local_startup" },

View File

@ -843,9 +843,6 @@ extern void mediaShutdownUFS(Device *dev);
extern Boolean mediaInitUFS(Device *dev);
extern FILE *mediaGetUFS(Device *dev, char *file, Boolean probe);
/* usb.c */
extern void usbInitialize(void);
/* user.c */
extern int userAddGroup(dialogMenuItem *self);
extern int userAddUser(dialogMenuItem *self);

View File

@ -11,7 +11,7 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \
ftp.c globals.c http.c index.c install.c installUpgrade.c keymap.c \
label.c main.c makedevs.c media.c menus.c misc.c modules.c \
mouse.c msg.c network.c nfs.c options.c package.c \
system.c tape.c tcpip.c termcap.c ttys.c ufs.c usb.c user.c \
system.c tape.c tcpip.c termcap.c ttys.c ufs.c user.c \
variable.c ${_wizard} keymap.h
CFLAGS+= -DUSE_GZIP=1

View File

@ -120,12 +120,6 @@ main(int argc, char **argv)
}
#endif
/* Initialize USB, if we haven't already done so. */
if (!pvariable_get("usbInitialize")) {
usbInitialize();
pvariable_set("usbInitialize=1");
}
/* Probe for all relevant devices on the system */
deviceGetAll();

View File

@ -1372,10 +1372,6 @@ DMenu MenuStartup = {
{ " pccard ifconfig", "List of PCCARD ethernet devices to configure",
dmenuVarCheck, dmenuISetVariable, NULL, "pccard_ifconfig" },
#endif
{ " usbd", "Enable USB daemon (detect USB attach / detach)",
dmenuVarCheck, dmenuToggleVariable, NULL, "usbd_enable=YES" },
{ " usbd flags", "Set default flags to usbd (if enabled)",
dmenuVarCheck, dmenuISetVariable, NULL, "usbd_flags" },
{ " ", " -- ", NULL, NULL, NULL, NULL, ' ', ' ', ' ' },
{ " Startup dirs", "Set the list of dirs to look for startup scripts",
dmenuVarCheck, dmenuISetVariable, NULL, "local_startup" },

View File

@ -843,9 +843,6 @@ extern void mediaShutdownUFS(Device *dev);
extern Boolean mediaInitUFS(Device *dev);
extern FILE *mediaGetUFS(Device *dev, char *file, Boolean probe);
/* usb.c */
extern void usbInitialize(void);
/* user.c */
extern int userAddGroup(dialogMenuItem *self);
extern int userAddUser(dialogMenuItem *self);

View File

@ -1,44 +0,0 @@
/*
* USB support for sysinstall
*
* $FreeBSD$
*
* Copyright (c) 2000 John Baldwin <jhb@FreeBSD.org>. All rights reserved.
*
* This software may be used, modified, copied, and distributed, in
* both source and binary form provided that the above copyright and
* these terms are retained. Under no circumstances is the author
* responsible for the proper functioning of this software, nor does
* the author assume any responsibility for damages incurred with its
* use.
*/
#include "sysinstall.h"
#include <sys/fcntl.h>
#include <sys/time.h>
void
usbInitialize(void)
{
int fd;
WINDOW *w;
if (!RunningAsInit && !Fake) {
/* It's not my job... */
return;
}
if ((fd = open("/dev/usb", O_RDONLY)) < 0) {
msgDebug("Can't open USB controller.\n");
return;
}
close(fd);
w = savescr();
msgNotify("Initializing USB controller....");
variable_set2("usbd_enable", "YES", 1);
vsystem("/stand/usbd");
restorescr(w);
}

View File

@ -1,6 +0,0 @@
# $FreeBSD$
PROG= usbd
MAN= usbd.conf.5 usbd.8
.include <bsd.prog.mk>

View File

@ -1,153 +0,0 @@
.\" $NetBSD: usbd.8,v 1.2 1998/07/13 11:01:50 augustss Exp $
.\" Copyright (c) 1998 The NetBSD Foundation, Inc.
.\" All rights reserved.
.\"
.\" Author: Lennart Augustsson
.\"
.\" 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 NetBSD
.\" Foundation, Inc. and its contributors.
.\" 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
.\"
.\" $FreeBSD$
.\"
.Dd July 12, 1998
.Dt USBD 8
.Os
.Sh NAME
.Nm usbd
.Nd supervise USB attach/detach
.Sh SYNOPSIS
.Nm
.Op Fl c Ar configfile
.Op Fl d
.Op Fl e
.Op Fl f Ar device
.Op Fl n
.Op Fl t Ar timeout
.Op Fl v
.Sh DESCRIPTION
The
.Nm
utility handles USB device attachment and detachment.
It does two things.
Through opening the
.Pa /dev/usb0 ,
.Pa /dev/usb1 ,
etc.\& devices, it enables the kernel to handle change requests from
attached hubs.
This functionality will be removed when the kernel has
kernel threads.
The (multiple)
.Fl f Ar device
command line options specify which controllers it should handle.
Normally this option is not needed.
.Pp
If the
.Dq usb ,
.Dq ohci
and
.Dq uhci
modules are not loaded,
.Nm
will load them automatically.
.Pp
The second part is the handling of the attachment and detachment of USB
devices.
The device
.Pa /dev/usb
is opened and events are read from it.
Whenever a device is attached or
detached the list of actions read from
.Pa /etc/usbd.conf
is searched for a matching entry.
If found, the corresponding action is
executed.
.Pp
The command line options are as follows:
.Bl -tag -width Ds
.It Fl c Ar filename
Name of configuration file.
The default is
.Pa /etc/usbd.conf .
.It Fl d
Enable debugging to the standard output,
and do not disassociate from the controlling terminal.
.It Fl e
Do one device tree exploration, no event queue handling and then exit.
.It Fl f Ar device
Specify the pathname of a USB controller device file.
The flag may be repeated to watch more than one USB controller.
The default is
.Pa /dev/usb0
through
.Pa /dev/usb3 .
Do not specify the device
.Pa /dev/usb
here.
It is used for events only.
.It Fl n
Do not handle the event queue on /dev/usb.
.It Fl t Ar timeout
Set the timeout interval (in seconds) before an exploration happens
without being triggered by a connect or disconnect.
A timeout of 0 means that there is no timeout.
The default is 30.
.It Fl v
Be verbose.
Repeating the flag makes
.Nm
more verbose.
.El
.Sh FILES
.Bl -tag -width /etc/usbd.conf -compact
.It Pa /etc/usbd.conf
.It Pa /dev/usb
.It Pa /dev/usb0
.It Pa /dev/usb1
.It etc .
.El
.Sh SEE ALSO
.Xr usb 4 ,
.Xr usbd.conf 5
.Sh HISTORY
The
.Nm
utility appeared in
.Nx 1.4 .
.Sh AUTHORS
.An -nosplit
The
.Nm
driver was written by
.An Lennart Augustsson Aq augustss@carlstedt.se
for the
.Nx
project.
The event queue handling in
.Nm
was added by
.An Nick Hibma Aq n_hibma@FreeBSD.org .

File diff suppressed because it is too large Load Diff

View File

@ -1,163 +0,0 @@
.\"
.\" Copyright (c) 1999 Nick Hibma. 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. The name of the author may not be used to endorse or promote products
.\" derived from this software without specific prior written permission.
.\"
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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.
.\"
.\" $FreeBSD$
.\"
.\" Many parts of this manual have been snarfed from the pccard.conf (5) man
.\" page, copyright by Andrew McRae.
.\"
.Dd November 19, 1999
.Dt USBD.CONF 5
.Os
.Sh NAME
.Nm usbd.conf
.Nd
.Xr usbd 8
configuration file
.Sh DESCRIPTION
The
.Nm
file is the configuration file for the
.Xr usbd 8
daemon.
It provides information to allow execution of userland commands
on events reported by the
.Xr usb 4
subsystem in the kernel.
Currently the only events are device attach and
detach, but could in the future be extended to include power management
functions.
.Pp
The configuration file consists of a sorted list of entries.
Each entry
describes a set of criteria commands.
When an event occurs, the criteria
are checked and if met, the commands for that event are executed through
a shell.
The list is sorted and scanned from top to bottom.
The first
matching entry is used for an event.
.Pp
Each entry contains a number of fields.
There are 3 types of fields:
descriptive fields, selection criteria and commands to execute on
events.
The field names are case sensitive and should be all lower case.
Each field can have one or more arguments.
.Pp
The following fields are available:
.Bl -tag -width devicename\ <Id>
.It device Ar string
Start a new entry.
.Ar string
is an arbitrary string used for pretty printing.
.It product Ar id
Product Id
.It vendor Ar id
Vendor Id
.It release Ar id
Release Id, also called revision Id sometimes.
.It class Ar id
Device Class
.It subclass Ar id
Device Subclass
.It protocol Ar id
Device Protocol
.It devname Ar string
Device name, for example umass2, or ums0.
These device names can contain regular expressions.
See
.Xr regex 3
and
.Xr re_format 7 .
The device name that is matched can be used in the commands below
through adding ${DEVNAME} somewhere in that string.
.El
.Pp
String arguments may be quoted.
If a string argument contains a space or
tab character it needs to be enclosed in single or double quotes.
If an
argument contains a single or double quote, that quote needs to be
enclosed in double or single quotes respectively.
See below for
examples.
.Pp
Numeric arguments can either be specified in decimal (42), octal (052) or
hexadecimal (0x2a).
.Pp
The values for the fields
.Li product , vendor , release, class , subclass
and
.Li protocol
can be retrieved by killing the
.Nm usbd
daemon and running it with the
.Fl d
and
.Fl v
flags.
.Pp
Commands to be executed when the action is matched:
.Bl -tag -width devicename\ <Id>
.It attach Ar string
Shell command to execute when a device is attached.
.It detach Ar string
Shell command to execute when a device is detached.
.El
.Sh FILES
.Bl -tag -width /etc/usbd.conf -compact
.It Pa /etc/usbd.conf
The
.Nm usbd
configuration file.
.El
.Sh EXAMPLES
A sample entry to rescan the SCSI bus on connection of a
.Tn "Iomega USB Zip Drive" :
.Bd -literal
device "USB Zip drive"
product 0x0001
vendor 0x059b
release 0x0100
attach "/usr/bin/camcontrol rescan 0"
.Ed
.Pp
To start up moused for a newly attached mouse:
.Bd -literal
device "Mouse"
devname "ums[0-9]+"
attach "/usr/sbin/moused -p /dev/${DEVNAME} -I /var/run/moused.${DEVNAME}.pid"
.Ed
.Sh SEE ALSO
.Xr usb 4 ,
.Xr usbd 8 ,
.Xr usbdevs 8
.Sh AUTHORS
This manual page was written by
.An Nick Hibma Aq n_hibma@FreeBSD.org .
.Sh BUGS
It is currently not possible to use a selection criterion more than once.
For example, it is not possible to specify more than one vendor ID.