From f974c59eacd0d1e1f6ace0652db932f3b051fab7 Mon Sep 17 00:00:00 2001
From: Chunmei Xu <xuchunmei@linux.alibaba.com>
Date: Thu, 1 Dec 2022 12:57:44 +0800
Subject: [PATCH] fix iscsi-init.service start failed

Signed-off-by: Chunmei Xu <xuchunmei@linux.alibaba.com>
---
 0001-unit-file-tweaks.patch | 13 ++++++++++++-
 iscsi-initiator-utils.spec  | 19 +++++++++++--------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/0001-unit-file-tweaks.patch b/0001-unit-file-tweaks.patch
index 633a2d6..7b20830 100644
--- a/0001-unit-file-tweaks.patch
+++ b/0001-unit-file-tweaks.patch
@@ -4,17 +4,28 @@ Date: Tue, 4 Jun 2019 13:23:32 -0700
 Subject: [PATCH 1/1] unit file tweaks
 
 ---
+ etc/systemd/iscsi-init.service     |  2 +-
  etc/systemd/iscsi-mark-root-nodes  | 34 ++++++++++++++++++++++++++++++
  etc/systemd/iscsi-onboot.service   | 15 +++++++++++++
  etc/systemd/iscsi-shutdown.service | 15 +++++++++++++
  etc/systemd/iscsi.service          | 16 +++++++-------
  etc/systemd/iscsid.service         |  3 +--
  etc/systemd/iscsiuio.service       |  4 +---
- 6 files changed, 74 insertions(+), 13 deletions(-)
+ 7 files changed, 75 insertions(+), 14 deletions(-)
  create mode 100644 etc/systemd/iscsi-mark-root-nodes
  create mode 100644 etc/systemd/iscsi-onboot.service
  create mode 100644 etc/systemd/iscsi-shutdown.service
 
+diff --git a/etc/systemd/iscsi-init.service b/etc/systemd/iscsi-init.service
+index 17792da..3fe14c1 100644
+--- a/etc/systemd/iscsi-init.service
++++ b/etc/systemd/iscsi-init.service
+@@ -7,4 +7,4 @@ After=root.mount
+ [Service]
+ Type=oneshot
+ RemainAfterExit=no
+-ExecStart=/usr/bin/sh -c 'echo "InitiatorName=`@SBINDIR@/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi'
++ExecStart=/usr/bin/sh -c 'echo "InitiatorName=`/usr/sbin/iscsi-iname`" > /etc/iscsi/initiatorname.iscsi'
 diff --git a/etc/systemd/iscsi-mark-root-nodes b/etc/systemd/iscsi-mark-root-nodes
 new file mode 100644
 index 0000000..423412d
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index d036f41..212c30f 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -1,4 +1,4 @@
-%define anolis_release 2
+%define anolis_release 3
 
 Summary:  iSCSI daemon and utility programs
 Name:     iscsi-initiator-utils
@@ -46,7 +46,7 @@ Requires(postun): systemd
 Conflicts: NetworkManager < 1.20
 
 %global _hardened_build 1
-%global __provides_exclude_from ^(%{python2_sitearch}/.*\\.so|%{python3_sitearch}/.*\\.so)$
+%global __provides_exclude_from ^(%{python3_sitearch}/.*\\.so)$
 
 %description
 The iscsi package provides the server daemon for the iSCSI protocol,
@@ -248,11 +248,11 @@ fi
 %{abidir}/iscsistart-option.list
 %{abidir}/iscsi-gen-initiatorname-option.list
 %{_libdir}/libiscsi.so.0
-%{_mandir}/man8/iscsi-iname.8.gz
-%{_mandir}/man8/iscsiadm.8.gz
-%{_mandir}/man8/iscsid.8.gz
-%{_mandir}/man8/iscsistart.8.gz
-%{_mandir}/man8/iscsi-gen-initiatorname.8.gz
+%{_mandir}/man8/iscsi-iname.8.*
+%{_mandir}/man8/iscsiadm.8.*
+%{_mandir}/man8/iscsid.8.*
+%{_mandir}/man8/iscsistart.8.*
+%{_mandir}/man8/iscsi-gen-initiatorname.8.*
 %{_libdir}/libopeniscsiusr.so.*
 %{abidir}/libopeniscsiusr.dump
 %{abidir}/libiscsi.dump
@@ -263,7 +263,7 @@ fi
 %{_unitdir}/iscsiuio.service
 %{_unitdir}/iscsiuio.socket
 %config(noreplace) %{_sysconfdir}/logrotate.d/iscsiuiolog
-%{_mandir}/man8/iscsiuio.8.gz
+%{_mandir}/man8/iscsiuio.8.*
 
 %files devel
 %doc libiscsi/html
@@ -282,6 +282,9 @@ fi
 %{abidir}/libiscsi.cpython-310-%{_arch}-linux-gnu.dump
 
 %changelog
+* Thu Dec 01 2022 Chunmei Xu <xuchunmei@linux.alibaba.com> - 2.1.6-3
+- fix iscsi-init.service start failed
+
 * Thu Nov 03 2022 mgb01105731 <mgb01105731@alibaba-inc.com> - 2.1.6-2
 - optimise spec file
 
-- 
Gitee