Merge ~lucaskanashiro/ubuntu/+source/sg3-utils:fix-rescan-scsi-bus-focal into ubuntu/+source/sg3-utils:ubuntu/focal-devel

[Lucas Kanashiro]

Fix LP: #1976228. The package does not contain DEP-8 tests. The proposed changes are available in this PPA:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/rescan-scsi-bus-fix

[Andreas Hasenack (ahasenack)]

As elaborated in more detail in https://bugs.launchpad.net/ubuntu/+source/sg3-utils/+bug/1976228/comments/38, I don't think a focal fix is necessary, because sg_inq in focal returns the expected Device_type= information in its outout. Unless that depends on the running kernel (perhaps HWE changes things?). Actually, lemme check that real quick.

[Andreas Hasenack (ahasenack)]

Yeah, with the hwe kernel (5.15.0-83) in focal, sg_inq still returns Device_type and not PDT, so rescan-scsi-bus.sh is not affected by the bug.

Unless I misread this completely, focal isn't affected.

review: Disapprove

[Robie Basak (racb)]

Andreas asked me to mark this as Rejected.

Unmerged commits

ddc84ed... by Lucas Kanashiro on 2023-03-22

changelog

c7652b0... by Lucas Kanashiro on 2023-03-22

  * d/p/0002-Fix-crash-with-rescan-scsi-bus.sh-r.patch: do not allow
    rescan-scsi-bus.sh to remove device (LP: #1976228).

diff --git a/debian/changelog b/debian/changelog
index 0a711ed..f9e372b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sg3-utils (1.44-1ubuntu3) focal; urgency=medium
+
+  * d/p/0002-Fix-crash-with-rescan-scsi-bus.sh-r.patch: do not allow
+    rescan-scsi-bus.sh to remove device (LP: #1976228).
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 22 Mar 2023 12:08:43 -0300
+
 sg3-utils (1.44-1ubuntu2) focal; urgency=medium
 
   * Fix a typo in a udev rule that leads to truncated ID_SERIAL values in
diff --git a/debian/patches/0002-Fix-crash-with-rescan-scsi-bus.sh-r.patch b/debian/patches/0002-Fix-crash-with-rescan-scsi-bus.sh-r.patch
new file mode 100644
index 0000000..fcbb63e
--- /dev/null
+++ b/debian/patches/0002-Fix-crash-with-rescan-scsi-bus.sh-r.patch
@@ -0,0 +1,30 @@
+From 80b570a1f890d2912418f7698213dfca40443fa1 Mon Sep 17 00:00:00 2001
+From: "Nitin U. Yewale" <[e-mail]>
+Date: Mon, 3 Jan 2022 13:12:12 +0530
+Subject: [PATCH] fix crash with rescan-scsi-bus.sh -r
+
+---
+ scripts/rescan-scsi-bus.sh | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Origin: backport, https://github.com/doug-gilbert/sg3_utils/pull/10
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/sg3-utils/+bug/1976228
+Reviewed-By: Lucas Kanashiro <[e-mail]>
+Last-Update: 2023-08-30
+
+--- a/scripts/rescan-scsi-bus.sh
++++ b/scripts/rescan-scsi-bus.sh
+@@ -293,7 +293,13 @@
+   IPREV=`echo "$INQ" | grep 'Product revision level:' | sed 's/^[^:]*: \(.*\)$/\1/'`
+   STR=`printf "  Vendor: %-08s Model: %-16s Rev: %-4s" "$IVEND" "$IPROD" "$IPREV"`
+   IPTYPE=`echo "$INQ" | sed -n 's/.* Device_type=\([0-9]*\) .*/\1/p'`
++  if [ -z "$IPTYPE" ]; then
++    IPTYPE=$(echo "$INQ" | sed -n 's/.* PDT=\([0-9]*\) .*/\1/p')
++  fi
+   IPQUAL=`echo "$INQ" | sed -n 's/ *PQual=\([0-9]*\)  Device.*/\1/p'`
++  if [ -z "$IPQUAL" ] ; then
++    IPQUAL=$(echo "$INQ" | sed -n 's/ *PQual=\([0-9]*\)  PDT.*/\1/p')
++  fi
+   if [ "$IPQUAL" != 0 ] ; then
+     [ -z "$IPQUAL" ] && IPQUAL=3
+     [ -z "$IPTYPE" ] && IPTYPE=31
diff --git a/debian/patches/series b/debian/patches/series
index 0f8e6b5..4418e68 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-udevadm-path.patch
 fix-SCSI_IDENT_LUN_NAA_EXT-udev-rule.patch
+0002-Fix-crash-with-rescan-scsi-bus.sh-r.patch