aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDouglas Gilbert <dgilbert@interlog.com>2019-05-01 15:36:08 +0000
committerDouglas Gilbert <dgilbert@interlog.com>2019-05-01 15:36:08 +0000
commit3a5deb427c87030be41c99aa0b3fa26d9d79ec67 (patch)
tree2361460fc620be67749e562bcc644af77848abd1 /scripts
parentc3da9a6b41cbae7940180645721a35becdd5bc99 (diff)
downloadsg3_utils-3a5deb427c87030be41c99aa0b3fa26d9d79ec67.tar.gz
sg_vpd: add --examine option; gcc-9: suppress warnings; more testing work
git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@821 6180dd3e-e324-4e3e-922d-17de1ae2f315
Diffstat (limited to 'scripts')
-rw-r--r--scripts/40-usb-blacklist.rules8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/40-usb-blacklist.rules b/scripts/40-usb-blacklist.rules
index fd821f1e..6cce3e6b 100644
--- a/scripts/40-usb-blacklist.rules
+++ b/scripts/40-usb-blacklist.rules
@@ -3,8 +3,12 @@
#
# don't inquire sn and di on broken devices (https://bugzilla.suse.com/show_bug.cgi?id=840054)
+ACTION!="add|change", GOTO="usb_blacklist_end"
+KERNEL!="sd*[!0-9]|sr*", GOTO="usb_blacklist_end"
+
# unkown device
-ATTRS{idVendor}=="0aec", ATTRS{idProduct}=="3260", ENV{ID_SCSI_DI}="1"
+ATTRS{idVendor}=="0aec", ATTRS{idProduct}=="3260", ENV{ID_SCSI_INQUIRY}="1"
# Sony/JMicron port replicator
-ATTRS{idVendor}=="054c", ATTRS{idProduct}=="06a0", ENV{ID_SCSI_DI}="1"
+ATTRS{idVendor}=="054c", ATTRS{idProduct}=="06a0", ENV{ID_SCSI_INQUIRY}="1"
+LABEL="usb_blacklist_end"