Compare commits

..

No commits in common. "c8" and "imports/c8/python-rtslib-2.1.71-4.el8" have entirely different histories.

5 changed files with 13 additions and 48 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/rtslib-fb-2.1.75.tar.gz SOURCES/rtslib-fb-2.1.71.tar.gz

View File

@ -1 +1 @@
358077a7fef2e71230a1b5c87b1765c9292f17f6 SOURCES/rtslib-fb-2.1.75.tar.gz 9b8cf949711c104d5bf324847c37e386a4ea8ee1 SOURCES/rtslib-fb-2.1.71.tar.gz

View File

@ -1,18 +1,15 @@
diff --git a/rtslib/fabric.py b/rtslib/fabric.py diff --git a/rtslib/fabric.py b/rtslib/fabric.py
index eb8f115..c408661 100644 index b529f14..8264c37 100644
--- a/rtslib/fabric.py --- a/rtslib/fabric.py
+++ b/rtslib/fabric.py +++ b/rtslib/fabric.py
@@ -519,14 +519,14 @@ fabric_modules = { @@ -465,12 +465,12 @@ fabric_modules = {
"srpt": SRPTFabricModule,
"iscsi": ISCSIFabricModule, "iscsi": ISCSIFabricModule,
"loopback": LoopbackFabricModule, "loopback": LoopbackFabricModule,
- "qla2xxx": Qla2xxxFabricModule, - "qla2xxx": Qla2xxxFabricModule,
- "efct": EfctFabricModule,
- "sbp": SBPFabricModule,
- "tcm_fc": FCoEFabricModule,
+# "qla2xxx": Qla2xxxFabricModule, +# "qla2xxx": Qla2xxxFabricModule,
+# "efct": EfctFabricModule, - "sbp": SBPFabricModule,
+# "sbp": SBPFabricModule, +# "sbp": SBPFabricModule,
- "tcm_fc": FCoEFabricModule,
+# "tcm_fc": FCoEFabricModule, +# "tcm_fc": FCoEFabricModule,
# "usb_gadget": USBGadgetFabricModule, # very rare, don't show # "usb_gadget": USBGadgetFabricModule, # very rare, don't show
- "vhost": VhostFabricModule, - "vhost": VhostFabricModule,

View File

@ -1,8 +1,8 @@
diff --git a/rtslib/root.py b/rtslib/root.py diff --git a/rtslib/root.py b/rtslib/root.py
index ac40752..8e9724b 100644 index b83d7ee..49c4dfc 100644
--- a/rtslib/root.py --- a/rtslib/root.py
+++ b/rtslib/root.py +++ b/rtslib/root.py
@@ -166,19 +166,19 @@ class RTSRoot(CFSNode): @@ -166,13 +166,13 @@ 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)
@ -17,13 +17,6 @@ index ac40752..8e9724b 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))
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
self._dbroot = fread(dbroot_path) self._dbroot = fread(dbroot_path)
def _get_dbroot(self):

View File

@ -21,10 +21,10 @@ Name: python-rtslib
License: ASL 2.0 License: ASL 2.0
Group: System Environment/Libraries Group: System Environment/Libraries
Summary: API for Linux kernel LIO SCSI target Summary: API for Linux kernel LIO SCSI target
Version: 2.1.75 Version: 2.1.71
Release: 4%{?dist} Release: 4%{?dist}
URL: https://github.com/open-iscsi/%{oname} URL: https://fedorahosted.org/targetcli-fb/
Source: %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz Source: https://fedorahosted.org/released/targetcli-fb/%{oname}-%{version}.tar.gz
Source1: target.service Source1: target.service
Patch0: 0001-Turn-off-unsupported-fabrics.patch Patch0: 0001-Turn-off-unsupported-fabrics.patch
Patch1: 0002-default_dbroot.patch Patch1: 0002-default_dbroot.patch
@ -191,31 +191,6 @@ install -m 644 doc/saveconfig.json.5.gz %{buildroot}%{_mandir}/man5/
%endif # with python2 %endif # with python2
%changelog %changelog
* Wed Jun 15 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.75-4
- Updates to the gating tests from mhoyer
* Wed Jun 15 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.75-3
- Update the gating tests
* Wed Jun 15 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.75-2
- Fix the gating tests
* Mon Jun 06 2022 Maurizio Lombardi <mlombard@redhat.com> - 2.1.75-1
- Update to the latest upstream version
* Mon Oct 26 2020 Maurizio Lombardi <mlombard@redhat.com> - 2.1.74-1
- Update to the latest upstream version
* Tue Jul 21 2020 Maurizio Lombardi <mlombard@redhat.com> - 2.1.73-2
- Merge a fix to prevent a potential data leak when saving the config file
* Thu Jun 25 2020 Maurizio Lombardi <mlombard@redhat.com> - 2.1.73-1
- Update to new upstream version
* Mon May 11 2020 Maurizio Lombardi <mlombard@redhat.com> - 2.1.72-1
- Update to new upstream version
* Thu Dec 12 2019 Maurizio Lombardi <mlombard@redhat.com> - 2.1.71-4 * Thu Dec 12 2019 Maurizio Lombardi <mlombard@redhat.com> - 2.1.71-4
- LIO should use /var/target for its runtime files - LIO should use /var/target for its runtime files