From c283f5e23c496b0beebde6781a7ae800faee5c96 Mon Sep 17 00:00:00 2001
From: cenhuilin <cenhuilin@kylinos.cn>
Date: Mon, 25 Mar 2024 09:31:33 +0800
Subject: [PATCH] fix scanning progress output

---
 0011-rescan-scsi-bus.sh_seq_-s.patch | 71 ++++++++++++++++++++++++++++
 sg3_utils.spec                       |  6 ++-
 2 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 0011-rescan-scsi-bus.sh_seq_-s.patch

diff --git a/0011-rescan-scsi-bus.sh_seq_-s.patch b/0011-rescan-scsi-bus.sh_seq_-s.patch
new file mode 100644
index 0000000..b2832fa
--- /dev/null
+++ b/0011-rescan-scsi-bus.sh_seq_-s.patch
@@ -0,0 +1,71 @@
+From 255dab8831a41f078cf468ce8da2f2a3b5948130 Mon Sep 17 00:00:00 2001
+From: Douglas Gilbert <dgilbert@interlog.com>
+Date: Mon, 25 Mar 2024 09:21:49 +0800
+Subject: [PATCH] rescan-scsi-bus.sh: Use "seq -s"
+
+Since the commit [git: 8c86fe2; svn rev 815  "library: add to '.so' name;
+rescan-scsi-bus: multiple patches to sync with Suse], we correctly use
+quoting when we print $idsearch or $lunsearch. This causes a change in
+the output of the script, because these number lists are generated by
+the GNU seq utility, which uses "\n" as default separator, and the
+quoting now causes the newlines to be preserved. Use "seq -s" to
+generate space-separated lists instead.
+
+
+
+git-svn-id: https://svn.bingwo.ca/repos/sg3_utils/trunk@936 6180dd3e-e324-4e3e-922d-17de1ae2f315
+---
+ scripts/rescan-scsi-bus.sh | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh
+index 7508dba..a5f674e 100755
+--- a/scripts/rescan-scsi-bus.sh
++++ b/scripts/rescan-scsi-bus.sh
+@@ -720,7 +720,7 @@ expandlist ()
+       result="$result $beg";
+     else
+       end=${first#*-}
+-      result="$result $(seq $beg $end)"
++      result="$result $(seq -s ' ' $beg $end)"
+     fi
+     [ "$rest" = "$first" ] && rest=""
+     first=${rest%%,*}
+@@ -1235,7 +1235,7 @@ fi
+ unsetcolor
+ debug=0
+ lunsearch=
+-opt_idsearch=$(seq 0 7)
++opt_idsearch=$(seq -s ' ' 0 7)
+ filter_ids=0
+ opt_channelsearch=
+ remove=
+@@ -1263,13 +1263,13 @@ while [ ! -z "$opt" ] && [ -z "${opt##-*}" ] ; do
+     f) flush=1 ;;
+     i) lipreset=0 ;;
+     I) shift; lipreset=$opt ;;
+-    l) lunsearch=$(seq 0 7) ;;
+-    L) lunsearch=$(seq 0 "$2"); shift ;;
++    l) lunsearch=$(seq -s ' ' 0 7) ;;
++    L) lunsearch=$(seq -s ' ' 0 "$2"); shift ;;
+     m) mp_enable=1 ;;
+     r) remove=1 ;;
+     s) resize=1; mp_enable=1 ;;
+     u) update=1 ;;
+-    w) opt_idsearch=$(seq 0 15) ;;
++    w) opt_idsearch=$(seq -s ' ' 0 15) ;;
+     -alltargets)  existing_targets=;;
+     -attachpq3) scan_flags=$((scan_flags|0x1000000)) ;;
+     -channels=*)  arg=${opt#-channels=};opt_channelsearch=$(expandlist "$arg") ;;
+@@ -1294,7 +1294,7 @@ while [ ! -z "$opt" ] && [ -z "${opt##-*}" ] ; do
+     -sparselun) scan_flags=$((scan_flags|0x40)) ;;
+     -sync) sync=2 ;;
+     -update) update=1;;
+-    -wide) opt_idsearch=$(seq 0 15) ;;
++    -wide) opt_idsearch=$(seq -s ' ' 0 15) ;;
+     *) echo "Unknown option -$opt !" ;;
+   esac
+   shift
+-- 
+2.27.0
+
diff --git a/sg3_utils.spec b/sg3_utils.spec
index 1dd3372..2d61a24 100644
--- a/sg3_utils.spec
+++ b/sg3_utils.spec
@@ -1,6 +1,6 @@
 Name:    sg3_utils
 Version: 1.46
-Release: 8
+Release: 9
 Summary: Utilities that send SCSI commands to devices.
 License: GPL-2.0-or-later AND BSD
 URL:     http://sg.danny.cz/sg/sg3_utils.html
@@ -17,6 +17,7 @@ Patch7: 0007-rescan-scsi-bus-sgdevice26-do-not-traverse-sg-class-.patch
 Patch8: 0008-rescan-scsi-bus.sh-add-option-no-lip-scan.patch
 Patch9: 0009-rescan-scsi-bus.sh-speed-testonline.patch
 Patch10:0010-rescan-scsi-bus-speed-large-multipath-scans.patch
+Patch11:0011-rescan-scsi-bus.sh_seq_-s.patch
 
 Provides:      %{name}-libs
 Obsoletes:     %{name}-libs
@@ -80,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
 %{_mandir}/man8/*
 
 %changelog
+* Mon Mar 25 2024 cenhuilin <cenhuilin@kylinos.cn> - 1.46-9
+- fix scanning progress output
+
 * Fri Nov 4 2022 volcanodragon <linfeilong@huawei.com> - 1.46-8
 - backport speed multipath scan patches from mainline
 
-- 
Gitee