* Mon May 11 2026 Paul Evans <pevans@redhat.com> - 0.32-17

- lsscsi: Transport type FC and FCOE output inconsistencies [Patch v2] (RHEL-155569)

Resolves: RHEL-48228, RHEL-70371, RHEL-155569, RHEL-157252
This commit is contained in:
Paul Evans 2026-05-11 14:43:52 +01:00
parent 7d88460f34
commit 3b43af211f
2 changed files with 25 additions and 9 deletions

View File

@ -1,19 +1,23 @@
From ab8e09745bdaf09313ed548b05ba52d31b85146a Mon Sep 17 00:00:00 2001
From 4e25fd216188e2a2991097cc4b78722a2c189e80 Mon Sep 17 00:00:00 2001
From: Paul Evans <pevans@redhat.com>
Date: Fri, 20 Mar 2026 13:37:11 +0000
Subject: [PATCH] lsscsi: Transport type FC and FCOE output inconsistencies
Date: Mon, 11 May 2026 14:28:25 +0100
Subject: [PATCH v2] lsscsi: Transport type FC and FCOE output inconsistencies
Change the output for transport types "FC" and "FCOE" so that there is no
trailing colon ":" when listing with the "--list -t", bringing in-line with
the output for other transport types.
Also fix the double slash inconsistency with host path.
Signed-off-by: Paul Evans <pevans@redhat.com>
---
src/lsscsi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
v2: Include hosts double slash inconsistency fix
---
src/lsscsi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lsscsi.c b/src/lsscsi.c
index 5e8ff8e..beaa2b9 100644
index 5e8ff8e..0d0b0da 100644
--- a/src/lsscsi.c
+++ b/src/lsscsi.c
@@ -2265,7 +2265,7 @@ transport_init_longer(const char * path_name, const struct lsscsi_opts * op)
@ -34,6 +38,15 @@ index 5e8ff8e..beaa2b9 100644
if (! if_directory_chdir(path_name, "device"))
return;
if (NULL == getcwd(wd, wdlen))
@@ -4458,7 +4458,7 @@ one_host_entry(const char * dir_name, const char * devname,
printf("[?] ");
n = 0;
n += scnpr(buff + n, blen - n, "%s", dir_name);
- n += scnpr(buff + n, blen - n, "%s", "/");
+ //n += scnpr(buff + n, blen - n, "%s", "/");
scnpr(buff + n, blen - n, "%s", devname);
if ((get_value(buff, "proc_name", value, vlen)) &&
(strncmp(value, nullname1, 6)) && (strncmp(value, nullname2, 6)))
--
2.53.0
2.54.0

View File

@ -1,7 +1,7 @@
Summary: List SCSI devices (or hosts) and associated information
Name: lsscsi
Version: 0.32
Release: 16%{?dist}
Release: 17%{?dist}
License: GPL-2.0-or-later
# official git repository: https://github.com/doug-gilbert/lsscsi
Source0: http://sg.danny.cz/scsi/%{name}-%{version}.tgz
@ -14,7 +14,7 @@ Patch0: RHEL-48228-lsscsi-Fixes-for-SBP-Firewire-host-in-transport_h_in.patch
# https://redhat.atlassian.net/browse/RHEL-70371
Patch1: RHEL-70371-lsscsi-Change-default-output-trailing-space-after-ea.patch
# https://redhat.atlassian.net/browse/RHEL-155569
Patch2: RHEL-155569-lsscsi-Transport-type-FC-and-FCOE-output-inconsisten.patch
Patch2: RHEL-155569-v2-lsscsi-Transport-type-FC-and-FCOE-output-inconsis.patch
# https://redhat.atlassian.net/browse/RHEL-157252
Patch3: RHEL-157252-lsscsi-Device-name-spacing-before-major-minor-when-d.patch
@ -48,6 +48,9 @@ Author:
%changelog
* Mon May 11 2026 Paul Evans <pevans@redhat.com> - 0.32-17
- lsscsi: Transport type FC and FCOE output inconsistencies [Patch v2] (RHEL-155569)
* Thu Apr 02 2026 Paul Evans <pevans@redhat.com> - 0.32-16
- lsscsi: Fixes for SBP (Firewire) host in transport_h_init() (RHEL-48228)
- lsscsi: Change default output trailing space after each device entry (RHEL-70371)