summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2010-11-30 11:48:08 +0100
committerKay Sievers <kay.sievers@vrfy.org>2010-11-30 11:48:08 +0100
commit310f99d33595afdc1962611a913c429785f9ad40 (patch)
tree6f42711f267c1f26bf8d087132e45e74c758e033
parent5113029acbfd8c58ea3b86bb65e75de8a9db5434 (diff)
rules: revert bsg use until the event ordering problem is sorted out
The bsg devices node are created after the LUN, so we fail in the hotplug case, but succeed at coldplug, and create inconsistent data that way. The bsg device event order will need to be sorted out, by changing the kernel.
-rw-r--r--rules/rules.d/60-persistent-storage.rules14
1 files changed, 0 insertions, 14 deletions
diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules
index 8baabc2cf9..062049cd1d 100644
--- a/rules/rules.d/60-persistent-storage.rules
+++ b/rules/rules.d/60-persistent-storage.rules
@@ -6,18 +6,7 @@
# forward scsi device event to corresponding block device
ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change"
-# from this point on, we don't care about remove envets
-#
ACTION=="remove", GOTO="persistent_storage_end"
-
-# run scsi_id and ata_id on the actual SCSI device
-SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", ATTR{vendor}=="ATA", IMPORT{program}="ata_id --export $root/bsg/$kernel"
-# ATA/ATAPI devices is of type 0x05 and vendor is usually not ATA
-SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", ATTR{type}=="5", IMPORT{program}="ata_id --export $root/bsg/$kernel"
-SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --whitelisted --export --device $root/bsg/$kernel"
-
-# from this point on, only care about block devices
-#
SUBSYSTEM!="block", GOTO="persistent_storage_end"
# skip rules for inappropriate block devices
@@ -33,9 +22,6 @@ ENV{DEVTYPE}=="partition", IMPORT{parent}="ID_*"
KERNEL=="vd*[!0-9]", ATTRS{serial}=="?*", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/virtio-$env{ID_SERIAL}"
KERNEL=="vd*[0-9]", ATTRS{serial}=="?*", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/virtio-$env{ID_SERIAL}-part%n"
-# import ata_id/scsi_id data from the scsi_device captured above, if available
-SUBSYSTEMS=="scsi", IMPORT{parent}="ID_*"
-
# USB devices use their own serial number
KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="usb_id --export %p"
# ATA devices with their own "ata" kernel subsystem