X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=rules%2Frules.d%2F50-udev-default.rules;h=9b7f7207d1274d9c9775a399f86cd5e62844bf6b;hp=6eeb541b4d6f899ce2de6ab3fec44602f4abec46;hb=87fb336f39ea55ed76b3d909658f3390720a9244;hpb=38701863749cac0cc1c33694434282abbb0f04fa

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 6eeb541b4..9b7f7207d 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -1,5 +1,8 @@
 # do not edit this file, it will be overwritten on update
 
+SUBSYSTEM=="block", SYMLINK+="block/%M:%m"
+SUBSYSTEM!="block", SYMLINK+="char/%M:%m"
+
 KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660", OPTIONS+="last_rule"
 KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660", OPTIONS+="last_rule"
 KERNEL=="ptmx",			GROUP="tty", MODE="0666", OPTIONS+="last_rule"
@@ -48,7 +51,7 @@ KERNEL=="video1394*",		NAME="video1394/%n"
 SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"
 
 # libusb device nodes
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
+SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
 
 # printer
 KERNEL=="parport[0-9]*",	GROUP="lp"
@@ -60,8 +63,6 @@ KERNEL=="irlpt[0-9]*",		GROUP="lp"
 # block, tapes, block-releated
 SUBSYSTEM=="block", GROUP="disk"
 SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n"
-SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="0|7|14", ATTR{timeout}="60"
-SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="1", ATTR{timeout}="900"
 KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions"
 KERNEL=="fd[0-9]",		GROUP="floppy"
 KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"