diff --git a/0005-sg3_utils-rescan-scsi-bus-list-all-LUNs-in-one-line.patch b/0005-sg3_utils-rescan-scsi-bus-list-all-LUNs-in-one-line.patch new file mode 100644 index 0000000000000000000000000000000000000000..1e55d71683b4eb977c1f8715d2c96b93798b0546 --- /dev/null +++ b/0005-sg3_utils-rescan-scsi-bus-list-all-LUNs-in-one-line.patch @@ -0,0 +1,54 @@ +From f61c42e6669abc9cbcf7c5e7c52a627e6717939b Mon Sep 17 00:00:00 2001 +From: Zhiqiang Liu +Date: Sat, 29 Jan 2022 12:12:29 +0800 +Subject: [PATCH] sg3_utils: rescan scsi bus list all LUNs in one line + +fix issue: https://gitee.com/src-openeuler/sg3_utils/issues/I4RU82 + +rescan scsi bus list all LUNs in one line +before: +Scanning SCSI subsystem for new devices +Scanning host 0 for SCSI target IDs 0 +1 +2 +3 +4 +5 +6 +7, all LUNs +Scanning for device 0 2 4 0 ... + +after: +Scanning SCSI subsystem for new devices +Scanning host 0 for SCSI target IDs 0 1 2 3 4 5 6 7, all LUNs +Scanning for device 0 2 4 0 ... + +Signed-off-by: wubo +Signed-off-by: yanglongkang +Signed-off-by: Zhiqiang Liu +--- + scripts/rescan-scsi-bus.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/rescan-scsi-bus.sh b/scripts/rescan-scsi-bus.sh +index 46fe6c0..56cb9ed 100755 +--- a/scripts/rescan-scsi-bus.sh ++++ b/scripts/rescan-scsi-bus.sh +@@ -1337,12 +1337,12 @@ else + [ -n "$channelsearch" ] && echo -n "channels $channelsearch " + echo -n "for " + if [ -n "$idsearch" ] ; then +- echo -n " SCSI target IDs $idsearch" ++ echo -n " SCSI target IDs" $idsearch + else + echo -n " all SCSI target IDs" + fi + if [ -n "$lunsearch" ] ; then +- echo ", LUNs $lunsearch" ++ echo ", LUNs" $lunsearch + else + echo ", all LUNs" + fi +-- +1.8.3.1 + diff --git a/sg3_utils.spec b/sg3_utils.spec index 9ca0c5f5e05b688041f624572f95ec56f2c0553f..52c0dcc322f88f705512ba33a797ca03ff3f9287 100644 --- a/sg3_utils.spec +++ b/sg3_utils.spec @@ -1,6 +1,6 @@ Name: sg3_utils Version: 1.45 -Release: 6 +Release: 7 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 @@ -11,6 +11,7 @@ Patch1: 0001-sg3_utils-1.37-rescan-downpress.patch Patch2: 0002-bugfix-sg3_utils-fix-syntax-error.patch Patch3: 0003-sg3_utils-1.42-delete-lun-rescan-scsi-bus-report-error.patch Patch4: 0004-sg3_utils-fix-memset-coredump.patch +Patch5: 0005-sg3_utils-rescan-scsi-bus-list-all-LUNs-in-one-line.patch Provides: %{name}-libs Obsoletes: %{name}-libs @@ -74,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la %{_mandir}/man8/* %changelog +* Sat Jan 29 2022 Zhiqiang Liu - 1.45-7 +- rescan scsi bus list all LUNs in one line + * Wed Nov 3 2021 yanglongkang - 1.45-6 - sync each branch submit