From 12a7c14b86bb8039a46dfd1fe64e43ea9226d02f Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 22 May 2009 16:44:53 +0200 Subject: [PATCH] rules: add SUBSYSTEM match to scsi rules On Fri, May 22, 2009 at 16:15, Alan Jenkins wrote: > I've been looking at what is responsible for all the path lookup activity in > coldplug. On my debian stable system, it looks like every device gets its > parent looked up in sysfs. I think this is due to SUBSYSTEMS matches. > > I see the udev default rules are different, but it looks like they still > test for SUBSYSTEMS on every single device. Should we add SUBSYSTEM="scsi_generic" > to these three rules? --- rules/rules.d/50-udev-default.rules | 6 +++--- rules/rules.d/60-persistent-storage-tape.rules | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules index 87c897734..de96b95ba 100644 --- a/rules/rules.d/50-udev-default.rules +++ b/rules/rules.d/50-udev-default.rules @@ -69,18 +69,18 @@ KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitio # cdrom SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom" SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom" -SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" +SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%k", GROUP="cdrom" KERNEL=="pktcdvd", NAME="pktcdvd/control", GROUP="cdrom" # tape KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape" KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="tape" -SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape" +SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape" # block-releated KERNEL=="sch[0-9]*", GROUP="disk" -SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk" +SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk" KERNEL=="pg[0-9]*", GROUP="disk" KERNEL=="qft[0-9]*|nqft[0-9]*|zqft[0-9]*|nzqft[0-9]*|rawqft[0-9]*|nrawqft[0-9]*", GROUP="disk" KERNEL=="rawctl", NAME="raw/rawctl", GROUP="disk" diff --git a/rules/rules.d/60-persistent-storage-tape.rules b/rules/rules.d/60-persistent-storage-tape.rules index 8d5388892..30a011560 100644 --- a/rules/rules.d/60-persistent-storage-tape.rules +++ b/rules/rules.d/60-persistent-storage-tape.rules @@ -5,7 +5,7 @@ ACTION!="add|change", GOTO="persistent_storage_tape_end" # type 8 devices are "Medium Changers" -KERNEL=="sg[0-9]*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", IMPORT{program}="scsi_id --sg-version=3 --export --whitelisted -d $tempnode", SYMLINK+="tape/by-id/scsi-$env{ID_SERIAL}" +SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="8", IMPORT{program}="scsi_id --sg-version=3 --export --whitelisted -d $tempnode", SYMLINK+="tape/by-id/scsi-$env{ID_SERIAL}" SUBSYSTEM!="scsi_tape", GOTO="persistent_storage_tape_end" -- 2.30.2