Compare commits

..

4 Commits

Author SHA1 Message Date
CentOS Sources
41712aebb3 import python-rtslib-2.1.75-4.el8 2022-11-08 07:08:29 +00:00
CentOS Sources
d99868ab33 import python-rtslib-2.1.74-1.el8 2021-09-10 03:17:18 +00:00
CentOS Sources
7c08947809 import python-rtslib-2.1.73-2.el8 2021-09-10 03:17:15 +00:00
CentOS Sources
a2567b87ec import python-rtslib-2.1.71-4.el8 2021-09-10 03:17:12 +00:00
5 changed files with 82 additions and 10 deletions

2
.gitignore vendored
View File

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

View File

@ -1 +1 @@
4148d5c9083d72a952d431809db1adbea93668de SOURCES/rtslib-fb-2.1.fb69.tar.gz
358077a7fef2e71230a1b5c87b1765c9292f17f6 SOURCES/rtslib-fb-2.1.75.tar.gz

View File

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

View File

@ -0,0 +1,29 @@
diff --git a/rtslib/root.py b/rtslib/root.py
index ac40752..8e9724b 100644
--- a/rtslib/root.py
+++ b/rtslib/root.py
@@ -166,19 +166,19 @@ class RTSRoot(CFSNode):
self._dbroot = self._default_dbroot
return
self._dbroot = fread(dbroot_path)
- if self._dbroot != self._preferred_dbroot:
+ if self._dbroot != self._default_dbroot:
try:
- fwrite(dbroot_path, self._preferred_dbroot+"\n")
+ fwrite(dbroot_path, self._default_dbroot+"\n")
except:
- if not os.path.isdir(self._preferred_dbroot):
+ if not os.path.isdir(self._default_dbroot):
raise RTSLibError("Cannot set dbroot to {}. Please check if this directory exists."
- .format(self._preferred_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)

View File

@ -21,12 +21,13 @@ Name: python-rtslib
License: ASL 2.0
Group: System Environment/Libraries
Summary: API for Linux kernel LIO SCSI target
Version: 2.1.fb69
Release: 3%{?dist}
URL: https://fedorahosted.org/targetcli-fb/
Source: https://fedorahosted.org/released/targetcli-fb/%{oname}-%{version}.tar.gz
Version: 2.1.75
Release: 4%{?dist}
URL: https://github.com/open-iscsi/%{oname}
Source: %{url}/archive/v%{version}/%{oname}-%{version}.tar.gz
Source1: target.service
Patch0: 0001-Turn-off-unsupported-fabrics.patch
Patch1: 0002-default_dbroot.patch
BuildArch: noarch
BuildRequires: systemd-units
Requires(post): systemd
@ -100,6 +101,7 @@ on system restart.
%prep
%setup -q -n %{oname}-%{version}
%patch0 -p1
%patch1 -p1
%if %{with python3}
rm -rf %{py3dir}
@ -189,6 +191,43 @@ install -m 644 doc/saveconfig.json.5.gz %{buildroot}%{_mandir}/man5/
%endif # with python2
%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
- LIO should use /var/target for its runtime files
* Thu Nov 28 2019 Maurizio Lombardi <mlombard@redhat.com> - 2.1.71-2
- Remove support to qla2xxx
* Tue Nov 19 2019 Maurizio Lombardi <mlombard@redhat.com> - 2.1.71-1
- Update to new upstream version
* Wed May 15 2019 Maurizio Lombardi <mlombard@redhat.com> - 2.1.fb69-4
- report the correct size for partitions
* Thu Jan 17 2019 Maurizio Lombardi <mlombard@redhat.com> - 2.1.fb69-3
- Disable the FCoE fabric module