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

6 files changed, 3 insertions, 33 deletions

diff --git a/etc/Makefile b/etc/Makefile
index a87398a..5285d45 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -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 \
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index ddfa971..9b736c5 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -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.
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index fcbb2be..c8ab8fd 100755
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -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 \
diff --git a/etc/rc.d/syscons b/etc/rc.d/syscons
index 9d7caf5..b525f5e 100644
--- a/etc/rc.d/syscons
+++ b/etc/rc.d/syscons
@@ -28,7 +28,7 @@
 #
 
 # PROVIDE: syscons
-# REQUIRE: LOGIN usbd
+# REQUIRE: LOGIN
 # KEYWORD: nojail
 
 . /etc/rc.subr
diff --git a/etc/rc.d/usbd b/etc/rc.d/usbd
deleted file mode 100644
index 979589c..0000000
--- a/etc/rc.d/usbd
+++ /dev/null
@@ -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"
diff --git a/etc/usbd.conf b/etc/usbd.conf
deleted file mode 100644
index 4737c72..0000000
--- a/etc/usbd.conf
+++ /dev/null
@@ -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"