summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authoriedowse <iedowse@FreeBSD.org>2004-11-28 23:16:00 +0000
committeriedowse <iedowse@FreeBSD.org>2004-11-28 23:16:00 +0000
commitee64a49effa3bd7ad6af96dff45e0f9f16ec3163 (patch)
tree75af19bffa79cb3fea90b60fca596acf9d9c235f /etc
parent79c8e254bb2450cdb7489d5c7bdbc74b13525bbe (diff)
downloadFreeBSD-src-ee64a49effa3bd7ad6af96dff45e0f9f16ec3163.zip
FreeBSD-src-ee64a49effa3bd7ad6af96dff45e0f9f16ec3163.tar.gz
Move the purely device-name based entries for mice and ethernet
adapters from usbd.conf to devd.conf. USB ethernet devices were already handled in devd.conf so this just removes their usbd.conf entry. PR: conf/73799
Diffstat (limited to 'etc')
-rw-r--r--etc/devd.conf7
-rw-r--r--etc/usbd.conf16
2 files changed, 7 insertions, 16 deletions
diff --git a/etc/devd.conf b/etc/devd.conf
index db8cf0e..8c918ad 100644
--- a/etc/devd.conf
+++ b/etc/devd.conf
@@ -66,6 +66,13 @@ detach 100 {
action "kbdcontrol -k /dev/kbd0 < /dev/console";
};
+# The entry below starts moused when a mouse is plugged in. Moused
+# stops automatically (actually it bombs :) when the device disappears.
+attach 100 {
+ device-name "ums[0-9]+";
+ action "/etc/rc.d/moused start $device-name";
+};
+
#
# Rescan scsi device-names on attach, but not detach.
#
diff --git a/etc/usbd.conf b/etc/usbd.conf
index b80abcb..fca2aff 100644
--- a/etc/usbd.conf
+++ b/etc/usbd.conf
@@ -22,15 +22,6 @@ device "Entrega Serial with UART"
attach "if ! kldstat -n usio > /dev/null 2>&1 ; then kldload usio; fi"
attach "/usr/sbin/ezdownload -v -f /usr/share/usb/firmware/1645.8001.0101 /dev/${DEVNAME}"
-# The entry below starts and stops dhclient when an ethernet device is inserted
-# Caveat: It does not support multiple interfaces (but neither does pccardd,
-# it shouldn't be too big a deal :-)
-#
-device "USB ethernet"
- devname "([ackr]u|ax)e[0-9]+"
- attach "/etc/pccard_ether ${DEVNAME} start"
- detach "/etc/pccard_ether ${DEVNAME} stop"
-
# This entry starts the ColdSync tool in daemon mode. Make sure you have an up
# to date /usr/local/etc/palms. We override the 'listen' settings for port and
# type in /usr/local/etc/coldsync.conf.
@@ -41,13 +32,6 @@ device "Handspring Visor"
release 0x0100
attach "/usr/local/bin/coldsync -md -p /dev/${DEVNAME} -t usb"
-# The entry below starts moused when a mouse is plugged in. Moused
-# stops automatically (actually it bombs :) when the device disappears.
-#
-device "Mouse"
- devname "ums[0-9]+"
- attach "/etc/rc.d/moused start ${DEVNAME}"
-
# The fallthrough entry: Nothing is specified, nothing is done. And it isn't
# necessary at all :-). Just for pretty printing in debugging mode.
#
OpenPOWER on IntegriCloud