From d385e6706ea9e19cd5f3cbf614a28364692dfcef32d8ae5983fbcf689b2ddea1 Mon Sep 17 00:00:00 2001
From: Robert Milasan <robert@linux-source.org>
Date: Wed, 25 Jun 2014 07:57:15 +0000
Subject: [PATCH] Accepting request 238575 from
 home:rmilasan:branches:Base:System

- Fix missing rule for generating links for partitions also (bnc#883032)
  Add:
  sg3_utils-fix-missing-rule-for-scsi_serial-partitions.patch

OBS-URL: https://build.opensuse.org/request/show/238575
OBS-URL: https://build.opensuse.org/package/show/Base:System/sg3_utils?expand=0&rev=42
---
 ...fix-missing-rule-for-scsi_serial-partitions.patch | 12 ++++++++++++
 sg3_utils.changes                                    |  7 +++++++
 sg3_utils.spec                                       |  2 ++
 3 files changed, 21 insertions(+)
 create mode 100644 sg3_utils-fix-missing-rule-for-scsi_serial-partitions.patch

diff --git a/sg3_utils-fix-missing-rule-for-scsi_serial-partitions.patch b/sg3_utils-fix-missing-rule-for-scsi_serial-partitions.patch
new file mode 100644
index 0000000..2db1163
--- /dev/null
+++ b/sg3_utils-fix-missing-rule-for-scsi_serial-partitions.patch
@@ -0,0 +1,12 @@
+Index: sg3_utils-1.39/scripts/58-scsi-sg3_symlink.rules
+===================================================================
+--- sg3_utils-1.39/scripts/58-scsi-sg3_symlink.rules
++++ sg3_utils-1.39/scripts/58-scsi-sg3_symlink.rules
+@@ -10,6 +10,7 @@ ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO
+ # Select which identifier to use per default
+ # 0: vpd page 0x80 identifier
+ ENV{SCSI_IDENT_SERIAL}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-S$env{SCSI_VENDOR}_$env{SCSI_MODEL}_$env{SCSI_IDENT_SERIAL}"
++ENV{SCSI_IDENT_SERIAL}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-S$env{SCSI_VENDOR}_$env{SCSI_MODEL}_$env{SCSI_IDENT_SERIAL}-part%n"
+ # 1: NAA identifier (prefix 3)
+ ENV{SCSI_IDENT_LUN_NAA}=="?*", ENV{DEVTYPE}=="disk", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA}"
+ ENV{SCSI_IDENT_LUN_NAA}=="?*", ENV{DEVTYPE}=="partition", SYMLINK+="disk/by-id/scsi-3$env{SCSI_IDENT_LUN_NAA}-part%n"
diff --git a/sg3_utils.changes b/sg3_utils.changes
index bba497e..1201b40 100644
--- a/sg3_utils.changes
+++ b/sg3_utils.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 25 07:53:48 UTC 2014 - rmilasan@suse.com
+
+- Fix missing rule for generating links for partitions also (bnc#883032)
+  Add:
+  sg3_utils-fix-missing-rule-for-scsi_serial-partitions.patch 
+
 -------------------------------------------------------------------
 Fri Jun 20 13:15:12 UTC 2014 - jengelh@inai.de
 
diff --git a/sg3_utils.spec b/sg3_utils.spec
index 110cd0b..7c83954 100644
--- a/sg3_utils.spec
+++ b/sg3_utils.spec
@@ -26,6 +26,7 @@ Group:          Hardware/Other
 Url:            http://sg.danny.cz/sg/sg3_utils.html
 
 Source:         http://sg.danny.cz/sg/p/%name-%version.tar.xz
+Patch0:         sg3_utils-fix-missing-rule-for-scsi_serial-partitions.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  udev
 BuildRequires:  xz
@@ -80,6 +81,7 @@ applications that want to make use of libsgutils.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-static --with-pic