From 4070670b1431cae729da080c9958079b312ccd74 Mon Sep 17 00:00:00 2001 From: Wenchao Hao Date: Mon, 17 May 2021 09:32:46 +0800 Subject: [PATCH 1/3] iscsid.service ExecStopPost to ExecStartPost to fix systemd warning Move change of iscsid.service to one patch which number is 0003. So changes about iscsid.service in patch which number is 0004 is removed and patch which number is 0019 is removed. Signed-off-by: Wenchao Hao --- 0003-add-sleep-for-service.patch | 12 ++++---- ...t-send-stop-message-if-iscsid-absent.patch | 16 +--------- ...csid-service-PIDFile-to-run-iscsid.i.patch | 29 ------------------- open-iscsi.spec | 8 +++-- 4 files changed, 13 insertions(+), 52 deletions(-) delete mode 100644 0019-iscsid-Change-iscsid-service-PIDFile-to-run-iscsid.i.patch diff --git a/0003-add-sleep-for-service.patch b/0003-add-sleep-for-service.patch index bc26f70..a37f377 100644 --- a/0003-add-sleep-for-service.patch +++ b/0003-add-sleep-for-service.patch @@ -8,14 +8,14 @@ add sleep for service Signed-off-by: pengyeqing Signed-off-by: wuguanghao --- - etc/systemd/iscsid.service | 15 ++++++--------- - 1 file changed, 6 insertions(+), 9 deletions(-) + etc/systemd/iscsid.service | 17 ++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service index 4fef168..f3f8c65 100644 --- a/etc/systemd/iscsid.service +++ b/etc/systemd/iscsid.service -@@ -1,17 +1,14 @@ +@@ -1,17 +1,16 @@ [Unit] Description=Open-iSCSI Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8) @@ -31,10 +31,12 @@ index 4fef168..f3f8c65 100644 -KillMode=mixed -Restart=on-failure +Type=forking -+PIDFile=/var/run/iscsid.pid ++PIDFile=/run/iscsid.pid +ExecStart=/sbin/iscsid -+ExecStopPost=/usr/bin/sleep 1 ++ExecStartPost=/usr/bin/sleep 1 +ExecStop=/sbin/iscsiadm -k 0 2 ++Restart=always ++RestartSec=2s [Install] WantedBy=multi-user.target diff --git a/0004-not-send-stop-message-if-iscsid-absent.patch b/0004-not-send-stop-message-if-iscsid-absent.patch index da09de5..ecb750b 100644 --- a/0004-not-send-stop-message-if-iscsid-absent.patch +++ b/0004-not-send-stop-message-if-iscsid-absent.patch @@ -5,23 +5,9 @@ Subject: [PATCH] iscsi-initiator-utils: not send stop message if iscsid absent Signed-off-by: pengyeqing --- - etc/systemd/iscsid.service | 2 ++ usr/iscsiadm.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 73 insertions(+) + 1 files changed, 71 insertions(+) -diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service -index f3f8c65..2cce190 100644 ---- a/etc/systemd/iscsid.service -+++ b/etc/systemd/iscsid.service -@@ -9,6 +9,8 @@ PIDFile=/var/run/iscsid.pid - ExecStart=/sbin/iscsid - ExecStopPost=/usr/bin/sleep 1 - ExecStop=/sbin/iscsiadm -k 0 2 -+Restart=always -+RestartSec=2s - - [Install] - WantedBy=multi-user.target diff --git a/usr/iscsiadm.c b/usr/iscsiadm.c index f2bd721..b386abe 100644 --- a/usr/iscsiadm.c diff --git a/0019-iscsid-Change-iscsid-service-PIDFile-to-run-iscsid.i.patch b/0019-iscsid-Change-iscsid-service-PIDFile-to-run-iscsid.i.patch deleted file mode 100644 index 543e5cb..0000000 --- a/0019-iscsid-Change-iscsid-service-PIDFile-to-run-iscsid.i.patch +++ /dev/null @@ -1,29 +0,0 @@ -From dafbd11b65b2bbceed1e9b72d6213ddea73a0a34 Mon Sep 17 00:00:00 2001 -From: Wenchao Hao -Date: Sat, 12 Dec 2020 17:09:34 +0800 -Subject: [PATCH] iscsid: Change iscsid service PIDFile to /run/iscsid.ipd - -The pid file has be changed from /var/run/iscsid.pid to -/run/iscsid.pid in code, here perform a sync. - -Signed-off-by: Wenchao Hao ---- - etc/systemd/iscsid.service | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service -index 828877f..be3ae9e 100644 ---- a/etc/systemd/iscsid.service -+++ b/etc/systemd/iscsid.service -@@ -6,7 +6,7 @@ DefaultDependencies=no - - [Service] - Type=forking --PIDFile=/var/run/iscsid.pid -+PIDFile=/run/iscsid.pid - ExecStart=/sbin/iscsid - ExecStopPost=/usr/bin/sleep 1 - ExecStop=/sbin/iscsiadm -k 0 2 --- -2.29.2.435.g72ffeb997e - diff --git a/open-iscsi.spec b/open-iscsi.spec index 3c849e8..75a6a89 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -4,7 +4,7 @@ Name: open-iscsi Version: 2.1.1 -Release: 6 +Release: 7 Summary: ISCSI software initiator daemon and utility programs License: GPLv2+ and BSD URL: http://www.open-iscsi.org @@ -27,7 +27,6 @@ Patch15: 0015-iscsi-Add-break-to-while-loop.patch Patch16: 0016-iscsi-fix-fd-leak.patch Patch17: 0017-Fix-devel-without-node-header-files.patch Patch18: 0018-resolve-compilation-errors.patch -Patch19: 0019-iscsid-Change-iscsid-service-PIDFile-to-run-iscsid.i.patch Patch20: 0020-check-for-header-length-underflow-during-checksum-ca.patch Patch21: 0021-check-for-u8-overflow-when-processing-TCP-options.patch Patch22: 0022-check-for-TCP-urgent-pointer-past-end-of-frame.patch @@ -165,7 +164,10 @@ fi %{_mandir}/man8/* %changelog -* Thu Apr 8 2021 haowenchao - 2.1.3-6 +* Mon May 17 2021 haowenchao - 2.1.1-7 +- Change iscsid.service ExecStopPost to ExecStartPost to fix systemd warning + +* Thu Apr 8 2021 haowenchao - 2.1.1-6 - Fix file residual files after open-iscsi removed * Tue Mon 22 2021 haowenchao - 2.1.1-5 From e6a1a3518b35e6c385d13699dd6915260426e2fc Mon Sep 17 00:00:00 2001 From: Wenchao Hao Date: Fri, 9 Jul 2021 15:41:40 +0800 Subject: [PATCH 2/3] backport one patch for solving install problem sync from branch openEuler-20.09 which commit id is 81fd136 Signed-off-by: Wenchao Hao --- ...Update-systemd-unit-files-for-iscsid.patch | 31 +++++++++++++++++++ open-iscsi.spec | 7 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0019-Update-systemd-unit-files-for-iscsid.patch diff --git a/0019-Update-systemd-unit-files-for-iscsid.patch b/0019-Update-systemd-unit-files-for-iscsid.patch new file mode 100644 index 0000000..3f0f65c --- /dev/null +++ b/0019-Update-systemd-unit-files-for-iscsid.patch @@ -0,0 +1,31 @@ +From 53034c2ae6d1e4ec659dbace9da02ee8bc48a352 Mon Sep 17 00:00:00 2001 +From: wuguanghao +Date: Tue, 1 Sep 2020 15:39:46 +0800 +Subject: [PATCH] Update systemd unit files for iscsid + +Update systemd unit files for iscsid + +Signed-off-by: Lee Duncan +Signed-off-by: wuguanghao +--- + etc/systemd/iscsid.service | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service +index 2cce190..828877f 100644 +--- a/etc/systemd/iscsid.service ++++ b/etc/systemd/iscsid.service +@@ -1,7 +1,8 @@ + [Unit] + Description=Open-iSCSI +-Documentation=man:iscsid(8) man:iscsiuio(8) man:iscsiadm(8) +-After=network.target NetworkManager-wait-online.service iscsiuio.service tgtd.service targetcli.service ++Documentation=man:iscsid(8) man:iscsiadm(8) ++After=network.target ++DefaultDependencies=no + + [Service] + Type=forking +-- +1.8.3.1 + diff --git a/open-iscsi.spec b/open-iscsi.spec index 75a6a89..cae3a9d 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -4,7 +4,7 @@ Name: open-iscsi Version: 2.1.1 -Release: 7 +Release: 8 Summary: ISCSI software initiator daemon and utility programs License: GPLv2+ and BSD URL: http://www.open-iscsi.org @@ -27,6 +27,7 @@ Patch15: 0015-iscsi-Add-break-to-while-loop.patch Patch16: 0016-iscsi-fix-fd-leak.patch Patch17: 0017-Fix-devel-without-node-header-files.patch Patch18: 0018-resolve-compilation-errors.patch +patch19: 0019-Update-systemd-unit-files-for-iscsid.patch Patch20: 0020-check-for-header-length-underflow-during-checksum-ca.patch Patch21: 0021-check-for-u8-overflow-when-processing-TCP-options.patch Patch22: 0022-check-for-TCP-urgent-pointer-past-end-of-frame.patch @@ -164,6 +165,10 @@ fi %{_mandir}/man8/* %changelog +* Fri Jul 9 2021 haowenchao - 2.1.1-8 +- backport one patch for solving install problem, sync from branch openEuler-20.09 + which commit id is 81fd136 + * Mon May 17 2021 haowenchao - 2.1.1-7 - Change iscsid.service ExecStopPost to ExecStartPost to fix systemd warning From efaac5d87b8443f085afb8ed264924df1d4e186c Mon Sep 17 00:00:00 2001 From: Wenchao Hao Date: Fri, 9 Jul 2021 16:11:44 +0800 Subject: [PATCH 3/3] Sync between openeuler branches whose major version is 2.1.1 Nothing change but release number to sync between branches Signed-off-by: Wenchao Hao --- open-iscsi.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/open-iscsi.spec b/open-iscsi.spec index cae3a9d..7b44e0d 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -4,7 +4,7 @@ Name: open-iscsi Version: 2.1.1 -Release: 8 +Release: 9 Summary: ISCSI software initiator daemon and utility programs License: GPLv2+ and BSD URL: http://www.open-iscsi.org @@ -165,6 +165,10 @@ fi %{_mandir}/man8/* %changelog +* Fri Jul 9 2021 haowenchao - 2.1.1-9 +- Nothing change but release number to sync with other branch whose major + is 2.1.1 + * Fri Jul 9 2021 haowenchao - 2.1.1-8 - backport one patch for solving install problem, sync from branch openEuler-20.09 which commit id is 81fd136