SOURCES (AC-branch): udev-hotplug_map.rules, udev-modprobe.rules, ...
freetz
freetz at pld-linux.org
Mon Jun 26 21:17:11 CEST 2006
Author: freetz Date: Mon Jun 26 19:17:11 2006 GMT
Module: SOURCES Tag: AC-branch
---- Log message:
- misc fixes from HEAD
---- Files affected:
SOURCES:
udev-hotplug_map.rules (1.2 -> 1.2.2.1) , udev-modprobe.rules (1.11 -> 1.11.2.1) , udev.rules (1.9.2.1 -> 1.9.2.2)
---- Diffs:
================================================================
Index: SOURCES/udev-hotplug_map.rules
diff -u SOURCES/udev-hotplug_map.rules:1.2 SOURCES/udev-hotplug_map.rules:1.2.2.1
--- SOURCES/udev-hotplug_map.rules:1.2 Sat Jan 7 14:48:58 2006
+++ SOURCES/udev-hotplug_map.rules Mon Jun 26 21:17:05 2006
@@ -1,3 +1,4 @@
+ACTION!="add", GOTO="hotplug_end"
SUBSYSTEM=="usb", SYSFS{idProduct}=="c281", SYSFS{idVendor}=="046d", RUN+="/sbin/modprobe -q iforce"
SUBSYSTEM=="usb", SYSFS{idProduct}=="0002", SYSFS{idVendor}=="0553", RUN+="/sbin/modprobe -q cpia_usb"
SUBSYSTEM=="usb", SYSFS{bDeviceSubClass}=="00", SYSFS{bDeviceClass}=="02", SYSFS{bDeviceProtocol}=="00", RUN+="/sbin/modprobe -q acm"
@@ -218,6 +219,7 @@
SUBSYSTEM=="usb", SYSFS{idProduct}=="0022", SYSFS{idVendor}=="056a", RUN+="/sbin/modprobe -q wacom"
SUBSYSTEM=="usb", SYSFS{idProduct}=="0023", SYSFS{idVendor}=="056a", RUN+="/sbin/modprobe -q wacom"
SUBSYSTEM=="usb", SYSFS{idProduct}=="0024", SYSFS{idVendor}=="056a", RUN+="/sbin/modprobe -q wacom"
+SUBSYSTEM=="usb", SYSFS{idProduct}=="0061", SYSFS{idVendor}=="056a", RUN+="/sbin/modprobe -q wacom"
SUBSYSTEM=="usb", SYSFS{idProduct}=="4200", SYSFS{idVendor}=="066f", RUN+="/sbin/modprobe -q stir4200"
SUBSYSTEM=="usb", SYSFS{bDeviceClass}=="09", SYSFS{bInterfaceClass}=="09", RUN+="/sbin/modprobe -q usbcore"
SUBSYSTEM=="usb", SYSFS{bInterfaceSubClass}=="01", SYSFS{bInterfaceProtocol}=="01", SYSFS{bInterfaceClass}=="03"
@@ -238,4 +240,4 @@
SUBSYSTEM=="usb", SYSFS{idProduct}=="0011", SYSFS{idVendor}=="056a", RUN+="/sbin/modprobe -q evdev"
SUBSYSTEM=="usb", SYSFS{idProduct}=="0042", SYSFS{idVendor}=="056a", RUN+="/sbin/modprobe -q evdev"
SUBSYSTEM=="usb", SYSFS{idProduct}=="0001", SYSFS{idVendor}=="1212", RUN+="/sbin/modprobe -q usblcd"
-
+LABEL="hotplug_end"
================================================================
Index: SOURCES/udev-modprobe.rules
diff -u SOURCES/udev-modprobe.rules:1.11 SOURCES/udev-modprobe.rules:1.11.2.1
--- SOURCES/udev-modprobe.rules:1.11 Sat Jan 7 14:09:48 2006
+++ SOURCES/udev-modprobe.rules Mon Jun 26 21:17:06 2006
@@ -1,76 +1,80 @@
-# workarounds needed to synchronize with sysfs
-ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", \
- WAIT_FOR_SYSFS="bus"
-ACTION=="add", SUBSYSTEM=="net", WAIT_FOR_SYSFS="address"
+ACTION!="add", GOTO="hotplug_not_add_event"
+
+# check a driver is already loaded
+ENV{PHYSDEVDRIVER}=="?*", GOTO="hotplug_driver_loaded"
# allow pci cold plug for usb controllers only
# alias pci:v*d*sv*sd*bc0Csc03i10* ohci-hcd
# alias pci:v*d*sv*sd*bc0Csc03i20* ehci-hcd
# alias pci:v*d*sv*sd*bc0Csc03i00* uhci-hcd
-ACTION=="add", SUBSYSTEM=="pci", ENV{UDEV_START}=="1", MODALIAS=="*", \
+SUBSYSTEM=="pci", ENV{UDEV_START}=="1", MODALIAS=="*", \
SYSFS{class}="0x0c0300|0x0c0310|0x0c0320", \
RUN+="/sbin/modprobe $modalias"
# modprobe pci devices on hot plug
-ACTION=="add", SUBSYSTEM=="pci", ENV{UDEV_START}!="1", MODALIAS=="*", \
+SUBSYSTEM=="pci", ENV{UDEV_START}!="1", MODALIAS=="*", \
RUN+="/sbin/modprobe $modalias"
# usbhid should be loaded before usbmouse, or else some Microsoft mice
# move vertically only
-ACTION=="add", MODALIAS="usb:v*p*d*dc*dsc*dp*ic03isc01ip02*", \
+MODALIAS=="usb:v*p*d*dc*dsc*dp*ic03isc01ip02*", \
RUN+="/sbin/modprobe usbhid"
# modprobe on hot plug (and cold plug, which is processed by udevstart)
-ACTION=="add", SUBSYSTEM=="usb", MODALIAS=="*", \
+SUBSYSTEM=="usb", MODALIAS=="*", \
RUN+="/sbin/modprobe $modalias"
-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
+SUBSYSTEM=="pcmcia", MODALIAS=="*", \
RUN+="/sbin/modprobe $modalias"
-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \
+SUBSYSTEM=="pcmcia", MODALIAS=="*", \
RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'"
-ACTION=="add", SUBSYSTEM=="ieee1394", MODALIAS=="*", \
+SUBSYSTEM=="ieee1394", MODALIAS=="*", \
RUN+="/sbin/modprobe $modalias"
# disks & magneto-optical disk:
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \
+SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \
RUN+="/sbin/modprobe sd_mod"
# enclosure:
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \
+SUBSYSTEM=="scsi", SYSFS{type}=="14", \
RUN+="/sbin/modprobe sd_mod"
# WORM & ROM:
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[45]", \
+SUBSYSTEM=="scsi", SYSFS{type}=="[45]", \
RUN+="/sbin/modprobe sr_mod"
# Tape:
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="Onstream", \
+SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="Onstream", \
SYSFS{model}!="ADR*", RUN+="/sbin/modprobe osst"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="Onstream", \
+SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}=="Onstream", \
SYSFS{model}=="ADR*", RUN+="/sbin/modprobe st"
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}!="Onstream", \
+SUBSYSTEM=="scsi", SYSFS{type}=="1", SYSFS{vendor}!="Onstream", \
RUN+="/sbin/modprobe st"
# printer, scanner (hp & all), changer & comm :
-ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[23689]", \
+SUBSYSTEM=="scsi", SYSFS{type}=="[23689]", \
RUN+="/sbin/modprobe sg"
+
+LABEL="hotplug_driver_loaded"
# helpers
-ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="*", \
- RUN+="/lib/udev/udev_net_helper"
-
-ACTION=="remove", SUBSYSTEM=="net", ENV{INTERFACE}=="*", \
+SUBSYSTEM=="net", ENV{INTERFACE}=="*", \
RUN+="/lib/udev/udev_net_helper"
-ACTION=="add", SUBSYSTEM=="input", \
+SUBSYSTEM=="input", \
RUN+="/lib/udev/udev_input_helper"
-ACTION=="add", SUBSYSTEM=="ieee1394", \
+SUBSYSTEM=="ieee1394", \
RUN+="/lib/udev/udev_ieee1394_helper"
+
+SUBSYSTEM=="firmware", \
+ RUN+="/lib/udev/firmware_helper"
+
+LABEL="hotplug_not_add_event"
+ACTION=="remove", SUBSYSTEM=="net", ENV{INTERFACE}=="*", \
+ RUN+="/lib/udev/udev_net_helper"
+
ACTION=="remove", SUBSYSTEM=="ieee1394", \
RUN+="/lib/udev/udev_ieee1394_helper"
-
-ACTION=="add", SUBSYSTEM=="firmware", \
- RUN+="/lib/udev/firmware_helper"
================================================================
Index: SOURCES/udev.rules
diff -u SOURCES/udev.rules:1.9.2.1 SOURCES/udev.rules:1.9.2.2
--- SOURCES/udev.rules:1.9.2.1 Thu Jan 26 17:08:23 2006
+++ SOURCES/udev.rules Mon Jun 26 21:17:06 2006
@@ -15,13 +15,13 @@
# console
KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", OPTIONS="last_rule"
KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", NAME="%k", GROUP="tty", OPTIONS="last_rule"
-KERNEL=="vcs*", NAME="%k", GROUP="tty", OPTIONS="last_rule"
-KERNEL=="vcsa*", NAME="%k", GROUP="tty", OPTIONS="last_rule"
-KERNEL=="tty", NAME="%k", GROUP="tty", MODE="0666", OPTIONS="last_rule"
-KERNEL=="tty[0-9]", NAME="%k", GROUP="tty", OPTIONS="last_rule"
-KERNEL=="tty[0-9][0-9]", NAME="%k", GROUP="tty", OPTIONS="last_rule"
-KERNEL=="console", NAME="%k", GROUP="console", MODE="0660"
-KERNEL=="ptmx", NAME="%k", GROUP="tty", MODE="0666"
+KERNEL=="vcs*", NAME="%k", GROUP="tty", OPTIONS="last_rule"
+KERNEL=="vcsa*", NAME="%k", GROUP="tty", OPTIONS="last_rule"
+KERNEL=="tty", NAME="%k", GROUP="tty", MODE="0666", OPTIONS="last_rule"
+KERNEL=="tty[0-9]", NAME="%k", GROUP="tty", OPTIONS="last_rule"
+KERNEL=="tty[0-9][0-9]", NAME="%k", GROUP="tty", OPTIONS="last_rule"
+KERNEL=="console", NAME="%k", GROUP="console", MODE="0660", OPTIONS="last_rule"
+KERNEL=="ptmx", NAME="%k", GROUP="tty", MODE="0666", OPTIONS="last_rule"
# tty devices
KERNEL=="ttyS[0-9]*", NAME="tts/%n", SYMLINK+="%k", GROUP="ttyS"
@@ -35,6 +35,7 @@
# all block devices
SUBSYSTEM=="block", GROUP="disk"
+ENV{PHYSDEVBUS}!="ide", GOTO="ide_end"
# cdrom symlinks and other good cdrom naming
BUS=="ide", KERNEL=="hd[a-z]", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode"
BUS=="scsi", KERNEL="sr[0-9]*", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode"
@@ -43,6 +44,7 @@
ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cdrw%e", GROUP="cdwrite"
ENV{ID_CDROM_DVD}=="?*", SYMLINK+="dvd%e", GROUP="disk"
ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="dvdrw%e", GROUP="cdwrite"
+LABEL="ide_end"
# disk devices
KERNEL=="sd*", NAME="%k", GROUP="disk"
@@ -63,24 +65,24 @@
SUBSYSTEM=="graphics", KERNEL=="nvidia*", NAME="%k", GROUP="video"
# alsa devices
-SUBSYSTEM="sound", KERNEL=="controlC[0-9]*", NAME="snd/%k", GROUP="audio"
-SUBSYSTEM="sound", KERNEL=="hw[CD0-9]*", NAME="snd/%k", GROUP="audio"
-SUBSYSTEM="sound", KERNEL=="midiC[D0-9]*", NAME="snd/%k", GROUP="audio"
-SUBSYSTEM="sound", KERNEL=="pcm[CD0-9cp]*", NAME="snd/%k", GROUP="audio"
-SUBSYSTEM="sound", KERNEL=="seq", NAME="snd/%k", GROUP="audio"
-SUBSYSTEM="sound", KERNEL=="timer", NAME="snd/%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="controlC[0-9]*", NAME="snd/%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="hw[CD0-9]*", NAME="snd/%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="midiC[D0-9]*", NAME="snd/%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="pcm[CD0-9cp]*", NAME="snd/%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="seq", NAME="snd/%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="timer", NAME="snd/%k", GROUP="audio"
# sound devices
-SUBSYSTEM="sound", KERNEL=="adsp", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-SUBSYSTEM="sound", KERNEL=="adsp[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-SUBSYSTEM="sound", KERNEL=="audio", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-SUBSYSTEM="sound", KERNEL=="audio[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-SUBSYSTEM="sound", KERNEL=="dsp", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-SUBSYSTEM="sound", KERNEL=="dsp[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-SUBSYSTEM="sound", KERNEL=="mixer", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-SUBSYSTEM="sound", KERNEL=="mixer[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-SUBSYSTEM="sound", KERNEL=="sequencer", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-SUBSYSTEM="sound", KERNEL=="sequencer[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="adsp", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="adsp[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="audio", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="audio[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="dsp", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="dsp[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="mixer", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="mixer[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="sequencer", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
+SUBSYSTEM=="sound", KERNEL=="sequencer[0-9]*", NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
# capi devices
KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20"
@@ -91,11 +93,6 @@
KERNEL=="msr[0-9]*", NAME="cpu/%n/msr"
KERNEL=="microcode", NAME="cpu/microcode"
-# dm devices (ignore them)
-KERNEL=="dm-[0-9]*", OPTIONS="ignore_device"
-# create a symlink named after the device map name
-# note devmap_name comes with multipath-tools package and it has it's own .rules file
-#KERNEL=="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK+="%c"
KERNEL=="device-mapper", NAME="mapper/control"
# fb devices
@@ -184,7 +181,7 @@
BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", SYMLINK+="pilot"
# usbfs-like device nodes
-SUBSYSTEM="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \
+SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", \
SYMLINK+="%c", GROUP="usb", MODE="0664"
# v4l devices
@@ -258,10 +255,7 @@
KERNEL=="uverbs*", NAME="infiniband/%k"
# tpm devices
-KERNEL=="tpm*", NAME="%k", OWNER="tss", MODE="0600"
+KERNEL=="tpm*", NAME="%k", MODE="0600"
# debugging monitor
RUN+="socket:/org/kernel/udev/monitor"
-
-# debug events to /events, but not on default udev_log="err"
-#ENV{UDEV_LOG}=="[4-9]", RUN+="/lib/udev/eventrecorder.sh"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/udev-hotplug_map.rules?r1=1.2&r2=1.2.2.1&f=u
http://cvs.pld-linux.org/SOURCES/udev-modprobe.rules?r1=1.11&r2=1.11.2.1&f=u
http://cvs.pld-linux.org/SOURCES/udev.rules?r1=1.9.2.1&r2=1.9.2.2&f=u
More information about the pld-cvs-commit
mailing list