rules: remove pnp shell script, acpi loads these modules properly

[elogind.git] / rules / rules.d / 50-udev-default.rules

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 75a3e6d39f741fc75859274ca9ddbdaf6a6d3732..9b7f7207d1274d9c9775a399f86cd5e62844bf6b 100644 (file)
--- 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"
@@ -18,7 +21,7 @@ KERNEL=="lirc0",              SYMLINK+="lirc"
 # mem
 KERNEL=="null|zero|full|random|urandom", MODE="0666"
 KERNEL=="null",                        SYMLINK+="XOR"
-KERNEL=="mem|kmem|port",       GROUP="kmem", MODE="0640"
+KERNEL=="mem|kmem|port|nvram", GROUP="kmem", MODE="0640"
 KERNEL=="ram0",                        SYMLINK+="ramdisk"
 KERNEL=="ram1",                        SYMLINK+="ram"
 
@@ -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"