!76 Remove iscsid's dependence of iscsi-init.service

From: @wenchao-hao
Reviewed-by: @liuzhiqiang26
Signed-off-by: @liuzhiqiang26
This commit is contained in:
openeuler-ci-bot 2021-12-06 09:04:32 +00:00 committed by Gitee
commit 2dad512dde
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From 6f60bb734892e4a6cb9ba0c48660814160ee49d2 Mon Sep 17 00:00:00 2001
From: Wenchao Hao <haowenchao@huawei.com>
Date: Mon, 6 Dec 2021 10:20:02 +0800
Subject: [PATCH] Remove iscsid.service's dependence of iscsi-init.service
iscsi-init.service is aimed to generate initiatorname.iscsi,
this name would be generated by spec file in openeulr, so we
excluded the iscsi-init.service.
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
---
etc/systemd/iscsid.service | 1 -
1 file changed, 1 deletion(-)
diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
index 3fd7dd3..70c7fbd 100644
--- a/etc/systemd/iscsid.service
+++ b/etc/systemd/iscsid.service
@@ -5,7 +5,6 @@ DefaultDependencies=no
After=network-online.target iscsiuio.service iscsi-init.service
Before=remote-fs-pre.target
Wants=remote-fs-pre.target
-Requires=iscsi-init.service
[Service]
Type=notify
--
1.8.3.1

View File

@ -4,7 +4,7 @@
Name: open-iscsi Name: open-iscsi
Version: 2.1.5 Version: 2.1.5
Release: 1 Release: 2
Summary: ISCSI software initiator daemon and utility programs Summary: ISCSI software initiator daemon and utility programs
License: GPLv2+ and BSD License: GPLv2+ and BSD
URL: http://www.open-iscsi.com URL: http://www.open-iscsi.com
@ -20,6 +20,7 @@ patch8: 0008-default-file-zero-after-power-outage.patch
patch9: 0009-not-send-stop-message-if-iscsid-absent.patch patch9: 0009-not-send-stop-message-if-iscsid-absent.patch
patch10: 0010-fix-iscsiadm-op-new-report-to-cannot-rename-error.patch patch10: 0010-fix-iscsiadm-op-new-report-to-cannot-rename-error.patch
patch11: 0011-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch patch11: 0011-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch
patch12: 0012-Remove-iscsid.service-s-dependence-of-iscsi-init.ser.patch
BuildRequires: flex bison doxygen kmod-devel systemd-units gcc git isns-utils-devel systemd-devel 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 BuildRequires: autoconf automake libtool libmount-devel openssl-devel pkg-config
@ -154,6 +155,9 @@ fi
%{_mandir}/man8/* %{_mandir}/man8/*
%changelog %changelog
* Mon Dec 6 2021 haowenchao <haowenchao@huawei.com> - 2.1.5-2
- Remove iscsid's dependence of iscsid-init.service
* Tue Nov 16 2021 haowenchao <haowenchao@huawei.com> - 2.1.5-1 * Tue Nov 16 2021 haowenchao <haowenchao@huawei.com> - 2.1.5-1
- Update open-iscsi version to 2.1.5-1 - Update open-iscsi version to 2.1.5-1