packages/open-iscsi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove iscsi-init.service from iscsi and iscsid service file

Browse Source 
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.

This commit remove requires of iscsi-init in iscsi.service

Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
This commit is contained in:
Wenchao Hao 2022-02-08 18:42:40 +08:00
parent 2371290404
commit 10f483e312
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0017-Remove-iscsi-init.service-from-iscsi-and-iscsid-serv.patch Normal file
View File

@ -0,0 +1,46 @@
From 87091daca5ebbebfa8ed9f8ac317b45ff4b90f51 Mon Sep 17 00:00:00 2001
From: Wenchao Hao <haowenchao@huawei.com>
Date: Tue, 8 Feb 2022 18:39:47 +0800
Subject: [PATCH] Remove iscsi-init.service from iscsi and iscsid service file
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.
This patch remove requires of iscsi-init in iscsi.service
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
---
etc/systemd/iscsi.service | 2 +-
etc/systemd/iscsid.service | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/etc/systemd/iscsi.service b/etc/systemd/iscsi.service
index 5e394b9..020a207 100644
--- a/etc/systemd/iscsi.service
+++ b/etc/systemd/iscsi.service
@@ -3,7 +3,7 @@ Description=Login and scanning of iSCSI devices
Documentation=man:iscsiadm(8) man:iscsid(8)
Before=remote-fs.target
After=network-online.target iscsid.service
-Requires=iscsid.socket iscsi-init.service
+Requires=iscsid.socket
Wants=network-online.target
[Service]
diff --git a/etc/systemd/iscsid.service b/etc/systemd/iscsid.service
index 49347f5..9d689e5 100644
--- a/etc/systemd/iscsid.service
+++ b/etc/systemd/iscsid.service
@@ -2,7 +2,7 @@
Description=Open-iSCSI
Documentation=man:iscsid(8) man:iscsiadm(8)
DefaultDependencies=no
-After=network-online.target iscsi-init.service
+After=network-online.target
Before=remote-fs-pre.target
Wants=remote-fs-pre.target
--
2.34.1

6
open-iscsi.spec
View File

@ -4,7 +4,7 @@
Name: open-iscsi
Version: 2.1.5
Release: 4
Release: 5
Summary: ISCSI software initiator daemon and utility programs
License: GPLv2+ and BSD
URL: http://www.open-iscsi.com
@ -25,6 +25,7 @@ patch13: 0013-Remove-session-info-password-print.patch
patch14: 0014-Remove-iscsiuio-from-build-and-install-recipe.patch
patch15: 0015-Remove-iscsiuio-source-code.patch
patch16: 0016-Remove-iscsiuio-from-config-and-service-file.patch
patch17: 0017-Remove-iscsi-init.service-from-iscsi-and-iscsid-serv.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
@ -151,6 +152,9 @@ fi
%{_mandir}/man8/*
%changelog
* Tue Feb 8 2021 haowenchao <haowenchao@huawei.com> - 2.1.5-5
- Remove iscsi's dependence of iscsid-init.service
* Thu Jan 26 2022 haowenchao <haowenchao@huawei.com> - 2.1.5-4
- Remove tool iscsiuio