diff --git a/0001-Remove-dependences-from-iscsi-init.service.patch b/0001-Remove-dependences-from-iscsi-init.service.patch new file mode 100644 index 0000000..66c4cc4 --- /dev/null +++ b/0001-Remove-dependences-from-iscsi-init.service.patch @@ -0,0 +1,28 @@ +From 432bbf979ee66ee29bb92e35fd6e3ffb948563e3 Mon Sep 17 00:00:00 2001 +From: Lee Duncan +Date: Wed, 29 Sep 2021 11:48:16 -0700 +Subject: [PATCH] Remove dependences from iscsi-init.service + +Since iscsid.service depends on it but disables +default dependencies, iscsi-init.service must +also disable default dependencies, or a dependency +loop can be created. +--- + etc/systemd/iscsi-init.service | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/etc/systemd/iscsi-init.service b/etc/systemd/iscsi-init.service +index e058ff0..eab4ff2 100644 +--- a/etc/systemd/iscsi-init.service ++++ b/etc/systemd/iscsi-init.service +@@ -1,6 +1,7 @@ + [Unit] + Description=One time configuration for iscsi.service + ConditionPathExists=!/etc/iscsi/initiatorname.iscsi ++DefaultDependencies=no + Before=iscsid.service + + [Service] +-- +2.33.0 + diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec index 888c418..efbd77a 100644 --- a/iscsi-initiator-utils.spec +++ b/iscsi-initiator-utils.spec @@ -9,7 +9,7 @@ Summary: iSCSI daemon and utility programs Name: iscsi-initiator-utils Version: 6.%{open_iscsi_version}.%{open_iscsi_build} -Release: 1.git%{shortcommit0}%{?dist} +Release: 2.git%{shortcommit0}%{?dist} License: GPLv2+ URL: https://github.com/open-iscsi/open-iscsi Source0: https://github.com/open-iscsi/open-iscsi/archive/%{commit0}.tar.gz#/open-iscsi-%{shortcommit0}.tar.gz @@ -40,6 +40,7 @@ Patch0021: 0021-use-Red-Hat-version-string-to-match-RPM-package-vers.patch Patch0022: 0022-iscsi_if.h-replace-zero-length-array-with-flexible-a.patch Patch0023: 0023-stop-using-Werror-for-now.patch Patch0024: 0024-minor-service-file-updates.patch +Patch0025: 0001-Remove-dependences-from-iscsi-init.service.patch BuildRequires: flex bison doxygen kmod-devel systemd-units BuildRequires: autoconf automake libtool libmount-devel openssl-devel @@ -303,6 +304,9 @@ fi %{python3_sitearch}/* %changelog +* Mon Nov 01 2021 Chris Leech - 6.2.1.4-2.git2a8f9d8 +- 2016482: iscsi-init.service modified to work in initramfs + * Wed Aug 11 2021 Chris Leech - 6.2.1.4-1.git2a8f9d8 - new upstream - iscsiuio fixes for newer upstream bnx2x driver having version removed