From 9fe32bfc314730874ac2e0a02b3463d977163ecc Mon Sep 17 00:00:00 2001
From: Markeryang <747675909@qq.com>
Date: Fri, 17 Jul 2020 16:06:57 +0800
Subject: [PATCH] update
 0000-sg3_utils-1.37-rescan-scsi-findremapped-enhance.patch.

---
 ...1.37-rescan-scsi-findremapped-enhance.patch | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/0000-sg3_utils-1.37-rescan-scsi-findremapped-enhance.patch b/0000-sg3_utils-1.37-rescan-scsi-findremapped-enhance.patch
index 2973477..95a9258 100644
--- a/0000-sg3_utils-1.37-rescan-scsi-findremapped-enhance.patch
+++ b/0000-sg3_utils-1.37-rescan-scsi-findremapped-enhance.patch
@@ -1,10 +1,19 @@
+From 03279699ded14ee8c28d21d7009259f79a836d17 Mon Sep 17 00:00:00 2001
+From: sunshihao <sunshihao@huawei.com>
+Date: Thu, 16 Apr 2020 10:24:51 +0800
+Subject: [PATCH 1/4] sg3_utils-1.37-rescan-scsi-findremapped-enhance
+
+---
+ scripts/rescan-scsi-bus.sh | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
 diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh
-index 16041ee..74d5683 100755
+index 46fe6c0..855cec9 100755
 --- a/scripts/rescan-scsi-bus.sh
 +++ b/scripts/rescan-scsi-bus.sh
-@@ -734,7 +734,12 @@ findremapped()
+@@ -808,7 +808,12 @@ findremapped()
      remapped=0
-     id_serial=`udevadm info -q all -n $sddev | grep "ID_SERIAL=" | cut -d"=" -f2`
+     id_serial=$(udevadm info -q all -n "$sddev" | grep "ID_SERIAL=" | cut -d"=" -f2)
      [ -z "$id_serial" ] && id_serial="none"
 -    if [ "$id_serial_old" != "$id_serial" ] ; then
 +    dm_name=`cat /sys/class/scsi_device/$hctl/device/block/$sddev/holders/*/dm/name 2>/dev/null`
@@ -16,3 +25,6 @@ index 16041ee..74d5683 100755
        remapped=1
      fi
      # If udev events updated the disks already, but the multipath device isn't update
+-- 
+2.19.1
+