File 0004-55-scsi-sg3_id.rules-read-VPD-pages-from-s... of Package sg3_utils

Overview Repositories Revisions Requests Users Attributes Meta

File 0004-55-scsi-sg3_id.rules-read-VPD-pages-from-sysfs.patch of Package sg3_utils (Revision c3701b0feff42984e225dd4fd10b7e51)

Currently displaying revision c3701b0feff42984e225dd4fd10b7e51 , Show latest

From bb1ae392692ac30ac0c67398e5cc48f915afeab4 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 20 Oct 2015 09:32:31 +0200
Subject: 55-scsi-sg3_id.rules: read VPD pages from sysfs

Newer kernel store VPD pages in sysfs, so this patch updates
55-scsi-sg3_id.rules to first try to read VPD pages from sysfs.
The original code is left in place as a fallback if the sysfs
pages are not present or could not be read.

Signed-off-by: Hannes Reinecke <hare@suse.de>
---
 scripts/55-scsi-sg3_id.rules | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/55-scsi-sg3_id.rules b/scripts/55-scsi-sg3_id.rules
index 8560176..e914a5d 100644
--- a/scripts/55-scsi-sg3_id.rules
+++ b/scripts/55-scsi-sg3_id.rules
@@ -16,9 +16,11 @@ ENV{SCSI_MODEL_ENC}=="?*", ENV{ID_MODEL_ENC}="$env{SCSI_MODEL_ENC}"
 ENV{SCSI_REVISION}=="?*", ENV{ID_REVISION}="$env{SCSI_REVISION}"
 ENV{SCSI_TYPE}=="?*", ENV{ID_TYPE}="$env{SCSI_TYPE}"
 # SCSI EVPD page 0x80 values
-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", IMPORT{program}="/usr/bin/sg_inq --export --page=sn $tempnode"
+KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", IMPORT{program}="/usr/bin/sg_inq --export --inhex=/sys/block/$kernel/device/vpd_pg80 --raw", ENV{ID_SCSI_SN}="1"
+KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", ENV{ID_SCSI_SN}!="1", IMPORT{program}="/usr/bin/sg_inq --export --page=sn $tempnode", ENV{ID_SCSI_SN}="1"
 # SCSI EVPD page 0x83 values
-KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", IMPORT{program}="/usr/bin/sg_inq --export --page=di $tempnode"
+KERNEL=="sd*[!0-9]", ENV{ID_SCSI}=="1", IMPORT{program}="/usr/bin/sg_inq --export --inhex=/sys/block/$kernel/device/vpd_pg83 --raw", ENV{ID_SCSI_DI}="1"
+KERNEL=="sd*[!0-9]|sr*", ENV{ID_SCSI}=="1", ENV{ID_SCSI_DI}!="1", IMPORT{program}="/usr/bin/sg_inq --export --page=di $tempnode", ENV{ID_SCSI_DI}="1"
 
 # ID_WWN compat mapping
 ENV{SCSI_IDENT_LUN_NAA_REGEXT}=="?*", ENV{ID_WWN}!="?*", ENV{ID_WWN}="0x$env{SCSI_IDENT_LUN_NAA_REGEXT}"
-- 
1.8.4.5

Places

File 0004-55-scsi-sg3_id.rules-read-VPD-pages-from-sysfs.patch of Package sg3_utils (Revision c3701b0feff42984e225dd4fd10b7e51)

Places