summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorGreg KH <greg@press.(none)>2005-06-21 16:36:29 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-21 16:36:29 -0700
commit972d318a3123b00d0ed6b78bbcf70a0965841a8e (patch)
tree8322245ad8e488ad3da9575e2d90b219a99880ea /etc
parentae8d5e161fe916e39f226ce53f2c5f8b31f582a0 (diff)
parentd27d3bb05288fb5e70bc3f3fc7da1dc8ee5413a8 (diff)
Merge gregkh@ehlo.org:/home/kay/public_html/pub/scm/linux/hotplug/udev-kay
Diffstat (limited to 'etc')
-rw-r--r--etc/udev/udev.conf.in1
-rw-r--r--etc/udev/udev.rules51
-rw-r--r--etc/udev/udev.rules.examples63
3 files changed, 52 insertions, 63 deletions
diff --git a/etc/udev/udev.conf.in b/etc/udev/udev.conf.in
index 9d5300a861..efdb1d1808 100644
--- a/etc/udev/udev.conf.in
+++ b/etc/udev/udev.conf.in
@@ -1,5 +1,4 @@
# udev.conf
-#
# Where in the filesystem to place the device nodes
udev_root="@udevdir@"
diff --git a/etc/udev/udev.rules b/etc/udev/udev.rules
index bc8c8bdd6c..bebf74802f 100644
--- a/etc/udev/udev.rules
+++ b/etc/udev/udev.rules
@@ -5,43 +5,42 @@
#
# if this is a ide cdrom, name it the default name, and create a symlink to cdrom
-BUS="ide", KERNEL="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK="cdrom"
-
-# create a symlink named after the device map name
-# note devmap_name comes with extras/multipath
-KERNEL="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
+BUS=="ide", KERNEL=="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK+="cdrom"
# DRI devices always go into a subdirectory (as per the LSB spec)
-KERNEL="card*", NAME="dri/card%n"
+KERNEL=="card*", NAME="dri/card%n"
# alsa devices
-KERNEL="controlC[0-9]*", NAME="snd/%k"
-KERNEL="hw[CD0-9]*", NAME="snd/%k"
-KERNEL="pcm[CD0-9cp]*", NAME="snd/%k"
-KERNEL="midiC[D0-9]*", NAME="snd/%k"
-KERNEL="timer", NAME="snd/%k"
-KERNEL="seq", NAME="snd/%k"
+KERNEL=="controlC[0-9]*", NAME="snd/%k"
+KERNEL=="hw[CD0-9]*", NAME="snd/%k"
+KERNEL=="pcm[CD0-9cp]*", NAME="snd/%k"
+KERNEL=="midiC[D0-9]*", NAME="snd/%k"
+KERNEL=="timer", NAME="snd/%k"
+KERNEL=="seq", NAME="snd/%k"
# input devices
-KERNEL="mice", NAME="input/%k"
-KERNEL="mouse*", NAME="input/%k"
-KERNEL="event*", NAME="input/%k"
-KERNEL="js*", NAME="input/%k"
-KERNEL="ts*", NAME="input/%k"
+KERNEL=="mice", NAME="input/%k"
+KERNEL=="mouse*", NAME="input/%k"
+KERNEL=="event*", NAME="input/%k"
+KERNEL=="js*", NAME="input/%k"
+KERNEL=="ts*", NAME="input/%k"
# USB devices
-KERNEL="hiddev*", NAME="usb/%k"
-KERNEL="auer*", NAME="usb/%k"
-KERNEL="legousbtower*", NAME="usb/%k"
-KERNEL="dabusb*", NAME="usb/%k"
-BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k"
+KERNEL=="hiddev*", NAME="usb/%k"
+KERNEL=="auer*", NAME="usb/%k"
+KERNEL=="legousbtower*", NAME="usb/%k"
+KERNEL=="dabusb*", NAME="usb/%k"
+BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k"
# CAPI devices
-KERNEL="capi", NAME="capi20", SYMLINK="isdn/capi20"
-KERNEL="capi*", NAME="capi/%n"
+KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20"
+KERNEL=="capi*", NAME="capi/%n"
# Network devices
-KERNEL="tun", NAME="net/%k"
+KERNEL=="tun", NAME="net/%k"
# raw devices
-KERNEL="raw[0-9]*", NAME="raw/%k"
+KERNEL=="raw[0-9]*", NAME="raw/%k"
+
+# emulate dev.d/
+RUN="/sbin/udev_run_devd"
diff --git a/etc/udev/udev.rules.examples b/etc/udev/udev.rules.examples
index a464b6ba57..1c4527891a 100644
--- a/etc/udev/udev.rules.examples
+++ b/etc/udev/udev.rules.examples
@@ -9,64 +9,55 @@
#
# Looking for scsi bus id 42:0:0:1
-BUS="scsi", PROGRAM="/bin/echo -n test-%b", RESULT="test-42:0:0:1", NAME="%c"
+BUS=="scsi", PROGRAM="/bin/echo -n test-%b", RESULT=="test-42:0:0:1", NAME="%c"
# A usb camera.
-BUS="usb", SYSFS{vendor}="FUJIFILM", SYSFS{model}="M100", NAME="camera%n"
+BUS=="usb", SYSFS{vendor}=="FUJIFILM", SYSFS{model}=="M100", NAME="camera%n"
# USB Epson printer to be called lp_epson
-BUS="usb", SYSFS_serial="HXOLL0012202323480", NAME="lp_epson"
+BUS=="usb", SYSFS_serial=="HXOLL0012202323480", NAME="lp_epson"
# USB HP printer to be called lp_hp
-BUS="usb", SYSFS{serial}="W09090207101241330", NAME="lp_hp"
+BUS=="usb", SYSFS{serial}=="W09090207101241330", NAME="lp_hp"
# sound card with PCI bus id 00:0b.0 to be the first sound card
-BUS="pci", ID="00:0b.0", NAME="dsp"
+BUS=="pci", ID=="00:0b.0", NAME="dsp"
# sound card with PCI bus id 00:07.1 to be the second sound card
-BUS="pci", ID="00:07.1", NAME="dsp1"
-
-# USB mouse plugged into the third port of the first hub to be called mouse0
-BUS="usb", PLACE="1.3", NAME="mouse0"
-
-# USB tablet plugged into the third port of the second hub to be called mouse1
-BUS="usb", PLACE="2.3", NAME="mouse1"
-BUS="usb", PLACE="2.4", NAME="mouse2"
+BUS=="pci", ID=="00:07.1", NAME="dsp1"
# ttyUSB1 should always be called visor
-KERNEL="ttyUSB1", NAME="visor"
-KERNEL="ttyUSB0", NAME="pl2303"
+KERNEL=="ttyUSB1", NAME="visor"
+KERNEL=="ttyUSB0", NAME="pl2303"
# a devfs like way to name some tty devices
-KERNEL="ttyS*", NAME="tts/%n"
-KERNEL="tty*", NAME="vc/%n"
+KERNEL=="ttyS*", NAME="tts/%n"
+KERNEL=="tty*", NAME="vc/%n"
# if this is a ide cdrom, name it the default name, and create a symlink to cdrom
-BUS="ide", KERNEL="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK="cdrom"
-
-# create a symlink named after the device map name
-# note devmap_name comes with extras/multipath
-KERNEL="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
+BUS=="ide", KERNEL=="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT=="cdrom", NAME="%k", SYMLINK+="cdrom"
# DRI devices always go into a subdirectory (as per the LSB spec)
-KERNEL="card*", NAME="dri/card%n"
+KERNEL=="card*", NAME="dri/card%n"
# create all 15 partitions of a USB flash card reader
-# note the trailing spaces in the attribute, use udevinfo(8) to examine your device
-BUS="scsi", SYSFS{model}="CF/MD ", NAME{all_partitions}="compactflash"
+BUS=="scsi", SYSFS{model}=="CF/MD", NAME{all_partitions}="compactflash"
# alsa devices
-KERNEL="controlC[0-9]*", NAME="snd/%k"
-KERNEL="hw[CD0-9]*", NAME="snd/%k"
-KERNEL="pcm[CD0-9cp]*", NAME="snd/%k"
-KERNEL="midi[CD0-9]*", NAME="snd/%k"
-KERNEL="timer", NAME="snd/%k"
-KERNEL="seq", NAME="snd/%k"
+KERNEL=="controlC[0-9]*", NAME="snd/%k"
+KERNEL=="hw[CD0-9]*", NAME="snd/%k"
+KERNEL=="pcm[CD0-9cp]*", NAME="snd/%k"
+KERNEL=="midi[CD0-9]*", NAME="snd/%k"
+KERNEL=="timer", NAME="snd/%k"
+KERNEL=="seq", NAME="snd/%k"
# input devices
-KERNEL="mice", NAME="input/%k"
-KERNEL="mouse*", NAME="input/%k"
-KERNEL="event*", NAME="input/%k"
-KERNEL="js*", NAME="input/%k"
-KERNEL="ts*", NAME="input/%k"
+KERNEL=="mice", NAME="input/%k"
+KERNEL=="mouse*", NAME="input/%k"
+KERNEL=="event*", NAME="input/%k"
+KERNEL=="js*", NAME="input/%k"
+KERNEL=="ts*", NAME="input/%k"
+
+# emulate dev.d/
+RUN="/sbin/udev_run_devd"