From: Kay Sievers <kay.sievers@suse.de>
Date: Thu, 22 Dec 2005 23:06:54 +0000 (+0100)
Subject: scsi_id: read page 0x80 with libata drives
X-Git-Tag: 174~2416
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=892532a9395d6b2c9cbaddde8b658fefa13bf7dc;hp=1698d39857e105876011b95e82d44c5e1e0846f2

scsi_id: read page 0x80 with libata drives

Signed-off-by: Kay Sievers <kay.sievers@suse.de>
---

diff --git a/extras/scsi_id/scsi_id.config b/extras/scsi_id/scsi_id.config
index 4f31b1c49..d1768509a 100644
--- a/extras/scsi_id/scsi_id.config
+++ b/extras/scsi_id/scsi_id.config
@@ -1,11 +1,8 @@
 #
-# Informational and example scsi_id.config file for use with scsi_id. 
-#
-
-# General syntax is:
+# scsi_id configuration
 #
 # lower or upper case has no affect on the left side. Quotes (") are
-# required if you need spaces in values. Model is the same as the SCSI
+# required for spaces in values. Model is the same as the SCSI
 # INQUIRY product identification field. Per the SCSI INQUIRY, the vendor
 # is limited to 8 bytes, model to 16 bytes.
 #
@@ -13,36 +10,8 @@
 # if you do not want such a match space fill the extra bytes. If no model
 # is specified, only the vendor string need match.
 #
-# The "options" line is searched for when scsi_id starts up, and is
-# primarily for use with hotplug.
-#
 # options=<any scsi_id command line options>
-#
 # vendor=string[,model=string],options=<per-device scsi_id options>
 
-#
-# If you normally don't need scsi id's, or might be attaching devices of
-# an unknown functionality, black list everyone. This is the default
-# behaviour (if no -b or -g is specified).
-#
-options=-b
-
-#
-# Then white list devices on your system that have correct and useful id's:
-#
-vendor=someone, model=nicedrive, options=-g
-
-# If you know all the scsi devices on your system support valid id's,
-# remove the options=-b line, and mark all devices as good:
-
-## options=-g
-
-# Then black list any offenders. Missing entries here could be dangerous
-# if you rely on the id for persistent naming or multi-path configuration.
-
-## vendor=ELBONIA, model=borken, options=-b
-
-# EMC SYMMETRIX models 4 and 5, and some model 6 systems return the VSI
-# field of the page 83 reply according to SCSI-2 format.  This format is
-# binary encoded hexa-decimal as opposed to the Identifiscation descriptor
-# utilized by both SPC-2 and SPC-3 compliant systems.
+# some libata drives require vpd page 0x80
+vendor="ATA",options=-p 0x80