Update to lsscsi-0.32
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
This commit is contained in:
parent
d3918f06a8
commit
f15b237582
@ -1,38 +0,0 @@
|
||||
From e06814242df16d7cb70b5ae739308b84390aa28c Mon Sep 17 00:00:00 2001
|
||||
From: dougg <dougg@aaa919c1-9816-4d37-901d-0171dbb97e96>
|
||||
Date: Thu, 9 Jul 2020 02:56:11 +0000
|
||||
Subject: [PATCH] improve NVMe device parsing and make WWN printing for NVMe
|
||||
more consistent
|
||||
|
||||
git-svn-id: https://svn.bingwo.ca/repos/lsscsi/trunk@163 aaa919c1-9816-4d37-901d-0171dbb97e96
|
||||
|
||||
Conflict: origin commit contains three changes:
|
||||
- improve NVMe device parsing (e.g. /dev/nvme0c1n2)
|
||||
- collect_disk_wwn_nodes: Fix WWN string copy
|
||||
- make WWN printing for NVMe more consistent with
|
||||
output from SCSI devices (e.g. with -u and -t)
|
||||
Here we pick the change of collect_disk_wwn_nodes which fix the incorrect output of wwn number
|
||||
Reference:https://github.com/doug-gilbert/lsscsi/commit/e06814242df16d7cb70b5ae739308b84390aa28c
|
||||
|
||||
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
|
||||
|
||||
---
|
||||
src/lsscsi.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/lsscsi.c b/src/lsscsi.c
|
||||
index 1fe1b3e..8fe85df 100644
|
||||
--- a/src/lsscsi.c
|
||||
+++ b/src/lsscsi.c
|
||||
@@ -1509,7 +1509,7 @@ collect_disk_wwn_nodes(void)
|
||||
}
|
||||
|
||||
cur_ent = &cur_list->nodes[cur_list->count];
|
||||
- my_strcopy(cur_ent->wwn, "0x", 2);
|
||||
+ my_strcopy(cur_ent->wwn, "0x", 3);
|
||||
my_strcopy(cur_ent->wwn + 2, dep->d_name + 5,
|
||||
sizeof(cur_ent->wwn) - 2);
|
||||
my_strcopy(cur_ent->disk_bname, basename(symlink_path),
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
BIN
lsscsi-0.30.tgz
BIN
lsscsi-0.30.tgz
Binary file not shown.
BIN
lsscsi-0.32.tgz
Normal file
BIN
lsscsi-0.32.tgz
Normal file
Binary file not shown.
12
lsscsi.spec
12
lsscsi.spec
@ -1,13 +1,12 @@
|
||||
Name: lsscsi
|
||||
Version: 0.30
|
||||
Release: 4
|
||||
Version: 0.32
|
||||
Release: 1
|
||||
Summary: The lsscsi command lists information about SCSI devices in Linux.
|
||||
License: GPLv2+
|
||||
URL: http://sg.danny.cz/scsi/lsscsi.html
|
||||
Source0: http://sg.danny.cz/scsi/%{name}-%{version}.tgz
|
||||
|
||||
Patch1: 0001-improve-NVMe-device-parsing-and-make-WWN-printing-fo.patch
|
||||
Patch2: 0002-Fix-lsscsi-wwn-number-output-error.patch
|
||||
Patch1: 0001-Fix-lsscsi-wwn-number-output-error.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
|
||||
@ -27,7 +26,7 @@ Requires: man info
|
||||
Man pages and other related documents for %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-030r154 -p1
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
@ -46,6 +45,9 @@ Man pages and other related documents for %{name}.
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Nov 18 2021 Wenchao Hao <haowenchao@huawei.com> - 0.32-1
|
||||
- Update to lsscsi-0.32
|
||||
|
||||
* Mon Aug 2 2021 Wenchao Hao <haowenchao@huawei.com> - 0.30-4
|
||||
- DESC: fix incorrect output of wwn number when execute "lsscsi -w"
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user