chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update Debian rules
[elogind.git]
/
etc
/
udev
/
debian
/
udev.rules
diff --git
a/etc/udev/debian/udev.rules
b/etc/udev/debian/udev.rules
index 07087a3a36c36f43c31f74e2c467f99e1c2e1d74..b5dfd005720edc4a5131494f3a7a7aa7d0a3f71a 100644
(file)
--- a/
etc/udev/debian/udev.rules
+++ b/
etc/udev/debian/udev.rules
@@
-15,28
+15,31
@@
# workaround for devices which do not report media changes
BUS=="ide", KERNEL=="hd[a-z]", SYSFS{removable}=="1", \
# workaround for devices which do not report media changes
BUS=="ide", KERNEL=="hd[a-z]", SYSFS{removable}=="1", \
- PROGRAM="/etc/udev/scripts/ide-model.sh %k", RESULT=="IOMEGA ZIP *", \
- NAME="%k", OPTIONS+="all_partitions"
+ ENV{ID_MODEL}=="IOMEGA_ZIP*", NAME="%k", OPTIONS+="all_partitions"
# SCSI devices
BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n"
# USB devices
# SCSI devices
BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n"
# USB devices
-BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k"
BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k"
BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k"
-BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k"
-BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k"
BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k"
BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k"
+BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k"
+BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k"
+BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k"
BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k"
BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \
BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k"
BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \
- SYMLINK+=="pilot"
+ SYMLINK+="pilot"
+
+# usbfs-like devices
+SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; B=$${K%%%%.*}; D=$${K#*.}; echo bus/usb/$$B/$$D'", \
+ NAME="%c"
# serial devices
KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20"
KERNEL=="capi[0-9]*", NAME="capi/%n"
# video devices
# serial devices
KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20"
KERNEL=="capi[0-9]*", NAME="capi/%n"
# video devices
-KERNEL=="dvb*", PROGRAM="/
etc/udev/scripts/dvb.sh %k
", \
+KERNEL=="dvb*", PROGRAM="/
bin/sh -c 'K=%k; K=$${K#dvb}; A=$${K%%%%.*}; D=$${K#*.}; echo dvb/adapter$$A/$$D'
", \
NAME="%c"
KERNEL=="card[0-9]*", NAME="dri/%k"
NAME="%c"
KERNEL=="card[0-9]*", NAME="dri/%k"
@@
-54,6
+57,8
@@
KERNEL=="microcode", NAME="cpu/microcode"
KERNEL=="umad*", NAME="infiniband/%k"
KERNEL=="issm*", NAME="infiniband/%k"
KERNEL=="umad*", NAME="infiniband/%k"
KERNEL=="issm*", NAME="infiniband/%k"
+KERNEL=="uverbs*", NAME="infiniband/%k"
+KERNEL=="ucm*", NAME="infiniband/%k"
# ALSA devices
KERNEL=="controlC[0-9]*", NAME="snd/%k"
# ALSA devices
KERNEL=="controlC[0-9]*", NAME="snd/%k"
@@
-88,6
+93,6
@@
SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k"
SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k"
# device mapper creates its own device nodes, so ignore these
SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k"
# device mapper creates its own device nodes, so ignore these
-KERNEL=="dm-[0-9]*",
OPTIONS+="ignore_device
"
+KERNEL=="dm-[0-9]*",
NAME="
"
KERNEL=="device-mapper", NAME="mapper/control"
KERNEL=="device-mapper", NAME="mapper/control"