Update to version 2.1.75

Resolves: #2087780

Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
This commit is contained in:
Maurizio Lombardi 2022-05-19 13:33:48 +02:00
parent f63afac764
commit 123108cf32
5 changed files with 22 additions and 18 deletions

1
.gitignore vendored
View File

@ -58,3 +58,4 @@
/rtslib-fb-2.1.fb69.tar.gz /rtslib-fb-2.1.fb69.tar.gz
/rtslib-fb-2.1.73.tar.gz /rtslib-fb-2.1.73.tar.gz
/rtslib-fb-2.1.74.tar.gz /rtslib-fb-2.1.74.tar.gz
/rtslib-fb-2.1.75.tar.gz

View File

@ -1,15 +1,17 @@
diff --git a/rtslib/fabric.py b/rtslib/fabric.py diff --git a/rtslib/fabric.py b/rtslib/fabric.py
index 02e156c..ff7387f 100644 index eb8f115..c408661 100644
--- a/rtslib/fabric.py --- a/rtslib/fabric.py
+++ b/rtslib/fabric.py +++ b/rtslib/fabric.py
@@ -464,13 +464,13 @@ fabric_modules = { @@ -519,14 +519,14 @@ fabric_modules = {
"srpt": SRPTFabricModule, "srpt": SRPTFabricModule,
"iscsi": ISCSIFabricModule, "iscsi": ISCSIFabricModule,
"loopback": LoopbackFabricModule, "loopback": LoopbackFabricModule,
- "qla2xxx": Qla2xxxFabricModule, - "qla2xxx": Qla2xxxFabricModule,
- "efct": EfctFabricModule,
- "sbp": SBPFabricModule, - "sbp": SBPFabricModule,
- "tcm_fc": FCoEFabricModule, - "tcm_fc": FCoEFabricModule,
+# "qla2xxx": Qla2xxxFabricModule, +# "qla2xxx": Qla2xxxFabricModule,
+# "efct": EfctFabricModule,
+# "sbp": SBPFabricModule, +# "sbp": SBPFabricModule,
+# "tcm_fc": FCoEFabricModule, +# "tcm_fc": FCoEFabricModule,
# "usb_gadget": USBGadgetFabricModule, # very rare, don't show # "usb_gadget": USBGadgetFabricModule, # very rare, don't show

View File

@ -1,22 +1,13 @@
diff --git a/rtslib/root.py b/rtslib/root.py diff --git a/rtslib/root.py b/rtslib/root.py
index 2c5cf43..34bc57d 100644 index ac40752..8e9724b 100644
--- a/rtslib/root.py --- a/rtslib/root.py
+++ b/rtslib/root.py +++ b/rtslib/root.py
@@ -166,21 +166,21 @@ class RTSRoot(CFSNode): @@ -166,19 +166,19 @@ class RTSRoot(CFSNode):
self._dbroot = self._default_dbroot self._dbroot = self._default_dbroot
return return
self._dbroot = fread(dbroot_path) self._dbroot = fread(dbroot_path)
- if self._dbroot != self._preferred_dbroot: - if self._dbroot != self._preferred_dbroot:
+ if self._dbroot != self._default_dbroot: + if self._dbroot != self._default_dbroot:
if len(FabricModule.list_registered_drivers()) != 0:
# Writing to dbroot_path after drivers have been registered will make the kernel emit this error:
# db_root: cannot be changed: target drivers registered
from warnings import warn
warn("Cannot set dbroot to {}. Target drivers have already been registered."
- .format(self._preferred_dbroot))
+ .format(self._default_dbroot))
return
try: try:
- fwrite(dbroot_path, self._preferred_dbroot+"\n") - fwrite(dbroot_path, self._preferred_dbroot+"\n")
+ fwrite(dbroot_path, self._default_dbroot+"\n") + fwrite(dbroot_path, self._default_dbroot+"\n")
@ -26,6 +17,13 @@ index 2c5cf43..34bc57d 100644
raise RTSLibError("Cannot set dbroot to {}. Please check if this directory exists." raise RTSLibError("Cannot set dbroot to {}. Please check if this directory exists."
- .format(self._preferred_dbroot)) - .format(self._preferred_dbroot))
+ .format(self._default_dbroot)) + .format(self._default_dbroot))
self._dbroot = fread(dbroot_path) else:
# Writing to dbroot_path after devices have been registered will make the kernel emit this error:
# db_root: cannot be changed: target devices registered
from warnings import warn
warn("Cannot set dbroot to {}. Target devices have already been registered."
- .format(self._preferred_dbroot))
+ .format(self._default_dbroot))
return
def _get_dbroot(self): self._dbroot = fread(dbroot_path)

View File

@ -6,8 +6,8 @@
Name: python-rtslib Name: python-rtslib
License: ASL 2.0 License: ASL 2.0
Summary: API for Linux kernel LIO SCSI target Summary: API for Linux kernel LIO SCSI target
Version: 2.1.74 Version: 2.1.75
Release: 7%{?dist} Release: 1%{?dist}
URL: https://github.com/open-iscsi/%{oname} URL: https://github.com/open-iscsi/%{oname}
Source: %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz Source: %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz
Patch0: 0001-Turn-off-unsupported-fabrics.patch Patch0: 0001-Turn-off-unsupported-fabrics.patch
@ -128,6 +128,9 @@ install -m 644 doc/saveconfig.json.5 %{buildroot}%{_mandir}/man5/
%endif %endif
%changelog %changelog
* Thu May 19 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.75-1
- Update to version 2.1.75
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.1.74-7 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.1.74-7
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688 Related: rhbz#1991688

View File

@ -1 +1 @@
SHA512 (rtslib-fb-2.1.74.tar.gz) = 181b57f699dd4e6bc050585e1abffe75a7eaf5ae8325220d61d37f932912f2cec878c4643172c584f0d4c231441d25ff0e09aa1f48c2305061b75acdce051c86 SHA512 (rtslib-fb-2.1.75.tar.gz) = 204729e779da1d0961ecff822c6ce914de5fa80e8159f440e0e69a7ba986da6d627a6377c143043d855bcaacaf086f4c73f3ccb4697dfaf061434c197ae24c3e