!62 Sync modify from other 2.1.1 version branch

From: @wenchao-hao
Reviewed-by: @wubo009
Signed-off-by: @liuzhiqiang26

0003-add-sleep-for-service.patch

@@ -8,14 +8,14 @@ add sleep for service
 Signed-off-by: pengyeqing <pengyeqing@huawei.com>
 Signed-off-by: wuguanghao <wuguanghao3@huawei.com>
 ---
- etc/systemd/iscsid.service | 15 ++++++---------
+ etc/systemd/iscsid.service | 17 ++++++---------
- 1 file changed, 6 insertions(+), 9 deletions(-)
+ 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

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 <pengyeqing@huawei.com>
 ---
- 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

0019-Update-systemd-unit-files-for-iscsid.patch

@@ -0,0 +1,31 @@
+From 53034c2ae6d1e4ec659dbace9da02ee8bc48a352 Mon Sep 17 00:00:00 2001
+From: wuguanghao <wuguanghao3@huawei.com>
+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 <lduncan@suse.com>
+Signed-off-by: wuguanghao <wuguanghao3@huawei.com>
+---
+ 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
+

0019-iscsid-Change-iscsid-service-PIDFile-to-run-iscsid.i.patch

@@ -1,29 +0,0 @@
-From dafbd11b65b2bbceed1e9b72d6213ddea73a0a34 Mon Sep 17 00:00:00 2001
-From: Wenchao Hao <haowenchao@huawei.com>
-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 <haowenchao@huawei.com>
----
- 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
-

open-iscsi.spec

@@ -4,7 +4,7 @@
 
 Name:    open-iscsi
 Version: 2.1.1
-Release: 6
+Release: 9
 Summary: ISCSI software initiator daemon and utility programs
 License: GPLv2+ and BSD
 URL:     http://www.open-iscsi.org
@@ -27,7 +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-iscsid-Change-iscsid-service-PIDFile-to-run-iscsid.i.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
@@ -165,7 +165,18 @@ fi
 %{_mandir}/man8/*
 
 %changelog
-* Thu Apr 8 2021 haowenchao <haowenchao@huawei.com> - 2.1.3-6
+* Fri Jul 9 2021 haowenchao <haowenchao@huawei.com> - 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 <haowenchao@huawei.com> - 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 <haowenchao@huawei.com> - 2.1.1-7
+- Change iscsid.service ExecStopPost to ExecStartPost to fix systemd warning
+
+* Thu Apr 8 2021 haowenchao <haowenchao@huawei.com> - 2.1.1-6
 - Fix file residual files after open-iscsi removed
 
 * Tue Mon 22 2021 haowenchao <haowenchao@huawei.com> - 2.1.1-5