From 81fd136d87b2f6e73bc65cc1f276b5d5d23123ef Mon Sep 17 00:00:00 2001 From: zhangyouming Date: Tue, 1 Sep 2020 20:14:41 +0800 Subject: [PATCH] backport one patch for solving install problem --- ...Update-systemd-unit-files-for-iscsid.patch | 31 +++++++++++++++++++ open-iscsi.spec | 7 +++-- 2 files changed, 36 insertions(+), 2 deletions(-) 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 4277547..a0e3681 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -4,7 +4,7 @@ Name: open-iscsi Version: 2.1.1 -Release: 1 +Release: 2 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-Update-systemd-unit-files-for-iscsid.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 gdb @@ -160,6 +160,9 @@ fi %{_mandir}/man8/* %changelog +* Tue Sep 1 2020 wuguanghao - 2.1.1-2 +- backport one patch for solving install problem + * Thu Jul 9 2020 wuguanghao - 2.1.1-1 - update open-iscsi version to 2.1.1-1