From 38d94556a6c9cbb54f5fb8a327e0a4a59013afca Mon Sep 17 00:00:00 2001 From: yanshuai01 Date: Wed, 24 Jul 2024 16:24:50 +0800 Subject: [PATCH] remove dependences from iscsi-init.service --- ...-dependences-from-iscsi-init.service.patch | 29 +++++++++++++++++++ open-iscsi.spec | 6 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0029-remove-dependences-from-iscsi-init.service.patch diff --git a/0029-remove-dependences-from-iscsi-init.service.patch b/0029-remove-dependences-from-iscsi-init.service.patch new file mode 100644 index 0000000..5cd236c --- /dev/null +++ b/0029-remove-dependences-from-iscsi-init.service.patch @@ -0,0 +1,29 @@ +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 + + [Service] + Type=oneshot +-- +2.27.0 + diff --git a/open-iscsi.spec b/open-iscsi.spec index 7479529..7364b74 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -4,7 +4,7 @@ Name: open-iscsi Version: 2.1.5 -Release: 14 +Release: 15 Summary: ISCSI software initiator daemon and utility programs License: GPLv2+ and BSD URL: http://www.open-iscsi.com @@ -37,6 +37,7 @@ patch25: 0025-iscsid-iscsiuio-fix-OOM-adjustment-377.patch patch26: 0026-iscsid-clear-scanning-thread-s-PR_SET_IO_FLUSHER-fla.patch patch27: 0027-iscsid-stop-connection-for-recovery-if-error-is-not-.patch patch28: 0028-discoveryd-fix-format-overflow-warning-413.patch +patch29: 0029-remove-dependences-from-iscsi-init.service.patch BuildRequires: flex bison doxygen kmod-devel systemd-units gcc git isns-utils-devel systemd-devel BuildRequires: autoconf automake libtool libmount-devel openssl-devel pkg-config @@ -163,6 +164,9 @@ fi %{_mandir}/man8/* %changelog +* Wed Jul 24 2024 yanshuai - 2.1.5-15 +- Remove dependences from iscsi-init.service + * Tue Feb 20 2024 jiangjianjun - 2.1.5-14 - update open-iscsi.spec -- Gitee