diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 71ce5fffe..63d9b3c95 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -296,9 +296,7 @@ bash haproxy haproxy-config -# iscsi-initiator-utils -iscsi-initiator-utils -iscsi-initiator-utils-iscsiuio +# iscsi-initiator-utils-config iscsi-initiator-utils-config # iptables diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 97b374028..cc99a7c57 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -136,7 +136,6 @@ base/libfdt base/bash base/haproxy base/haproxy-config -filesystem/iscsi-initiator-utils filesystem/iscsi-initiator-utils-config ldap/ldapscripts networking/net-tools diff --git a/filesystem/iscsi-initiator-utils-config/centos/iscsi-initiator-utils-config.spec b/filesystem/iscsi-initiator-utils-config/centos/iscsi-initiator-utils-config.spec index b94a7f420..16bf8434f 100644 --- a/filesystem/iscsi-initiator-utils-config/centos/iscsi-initiator-utils-config.spec +++ b/filesystem/iscsi-initiator-utils-config/centos/iscsi-initiator-utils-config.spec @@ -10,6 +10,7 @@ BuildArch: noarch Source: %name-%version.tar.gz Requires: iscsi-initiator-utils +Requires: iscsi-initiator-utils-iscsiuio Summary: package StarlingX configuration files of iscsi-initiator-utils to system folder. %description @@ -33,6 +34,8 @@ package StarlingX configuration files of iscsi-initiator-utils to system folder. if [ $1 -eq 1 ] ; then # Initial installation cp -f %{_datadir}/starlingx/stx.iscsid.conf %{_sysconfdir}/iscsi/iscsid.conf + chmod 0750 %{_sysconfdir}/iscsi + chmod 0640 %{_sysconfdir}/iscsi/iscsid.conf fi /bin/systemctl disable iscsi-shutdown.service diff --git a/filesystem/iscsi-initiator-utils/PKG-INFO b/filesystem/iscsi-initiator-utils/PKG-INFO deleted file mode 100644 index 1336d621b..000000000 --- a/filesystem/iscsi-initiator-utils/PKG-INFO +++ /dev/null @@ -1,17 +0,0 @@ -Metadata-Version: 1.1 -Name: iscsi-initiator-utils -Version: 2.0-873 -Summary: iSCSI daemon and utility programs -Home-page: -Author: -Author-email: -License: GPLv2+ - -Description: -The iscsi package provides the server daemon for the iSCSI protocol, -as well as the utility programs used to manage it. iSCSI is a protocol -for distributed disk access using SCSI commands sent over Internet -Protocol networks. - - -Platform: UNKNOWN diff --git a/filesystem/iscsi-initiator-utils/centos/build_srpm.data b/filesystem/iscsi-initiator-utils/centos/build_srpm.data deleted file mode 100644 index d3f64f336..000000000 --- a/filesystem/iscsi-initiator-utils/centos/build_srpm.data +++ /dev/null @@ -1 +0,0 @@ -TIS_PATCH_VER=3 diff --git a/filesystem/iscsi-initiator-utils/centos/meta_patches/0001-spec-include-TiS-changes.patch b/filesystem/iscsi-initiator-utils/centos/meta_patches/0001-spec-include-TiS-changes.patch deleted file mode 100644 index 3675aa167..000000000 --- a/filesystem/iscsi-initiator-utils/centos/meta_patches/0001-spec-include-TiS-changes.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 5a1612476a2b2a4783b5a1bd0f5493b3b3974ecb Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 16:19:19 -0400 -Subject: [PATCH 1/2] WRS: spec-include-TiS-changes.patch - ---- - SPECS/iscsi-initiator-utils.spec | 30 +++++++++++++++++++++--------- - 1 file changed, 21 insertions(+), 9 deletions(-) - -diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec -index a7bd696..847f95c 100644 ---- a/SPECS/iscsi-initiator-utils.spec -+++ b/SPECS/iscsi-initiator-utils.spec -@@ -232,13 +241,13 @@ fi - - %files - %doc README --%dir %{_sharedstatedir}/iscsi --%dir %{_sharedstatedir}/iscsi/nodes --%dir %{_sharedstatedir}/iscsi/isns --%dir %{_sharedstatedir}/iscsi/static --%dir %{_sharedstatedir}/iscsi/slp --%dir %{_sharedstatedir}/iscsi/ifaces --%dir %{_sharedstatedir}/iscsi/send_targets -+%ghost %{_sharedstatedir}/iscsi -+%ghost %{_sharedstatedir}/iscsi/nodes -+%ghost %{_sharedstatedir}/iscsi/isns -+%ghost %{_sharedstatedir}/iscsi/static -+%ghost %{_sharedstatedir}/iscsi/slp -+%ghost %{_sharedstatedir}/iscsi/ifaces -+%ghost %{_sharedstatedir}/iscsi/send_targets - %ghost %{_var}/lock/iscsi - %ghost %{_var}/lock/iscsi/lock - %{_unitdir}/iscsi.service -@@ -248,8 +257,8 @@ fi - %{_libexecdir}/iscsi-mark-root-nodes - %{_sysconfdir}/NetworkManager/dispatcher.d/04-iscsi - %{_tmpfilesdir}/iscsi.conf --%dir %{_sysconfdir}/iscsi --%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf -+%attr(0750,root,root) %dir %{_sysconfdir}/iscsi -+%attr(0640,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf - %{_sbindir}/iscsi-iname - %{_sbindir}/iscsiadm - %{_sbindir}/iscsid --- -2.7.4 - diff --git a/filesystem/iscsi-initiator-utils/centos/meta_patches/0002-Update-package-versioning-for-TIS-format.patch b/filesystem/iscsi-initiator-utils/centos/meta_patches/0002-Update-package-versioning-for-TIS-format.patch deleted file mode 100644 index 779672d13..000000000 --- a/filesystem/iscsi-initiator-utils/centos/meta_patches/0002-Update-package-versioning-for-TIS-format.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d30974d064455030457b4b37de3b3ea72a9feba0 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 16:19:19 -0400 -Subject: [PATCH 2/2] WRS: 0001-Update-package-versioning-for-TIS-format.patch - -Conflicts: - SPECS/iscsi-initiator-utils.spec ---- - SPECS/iscsi-initiator-utils.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SPECS/iscsi-initiator-utils.spec b/SPECS/iscsi-initiator-utils.spec -index 847f95c..8865737 100644 ---- a/SPECS/iscsi-initiator-utils.spec -+++ b/SPECS/iscsi-initiator-utils.spec -@@ -4,7 +4,7 @@ - Summary: iSCSI daemon and utility programs - Name: iscsi-initiator-utils - Version: 6.%{open_iscsi_version}.%{open_iscsi_build} --Release: 7%{?dist} -+Release: 7.el7%{?_tis_dist}.%{tis_patch_ver} - Group: System Environment/Daemons - License: GPLv2+ - URL: http://www.open-iscsi.org --- -2.7.4 - diff --git a/filesystem/iscsi-initiator-utils/centos/meta_patches/PATCH_ORDER b/filesystem/iscsi-initiator-utils/centos/meta_patches/PATCH_ORDER deleted file mode 100644 index 0fa12b23c..000000000 --- a/filesystem/iscsi-initiator-utils/centos/meta_patches/PATCH_ORDER +++ /dev/null @@ -1,3 +0,0 @@ -0001-spec-include-TiS-changes.patch -0002-Update-package-versioning-for-TIS-format.patch - diff --git a/filesystem/iscsi-initiator-utils/centos/srpm_path b/filesystem/iscsi-initiator-utils/centos/srpm_path deleted file mode 100644 index 35e4df0ed..000000000 --- a/filesystem/iscsi-initiator-utils/centos/srpm_path +++ /dev/null @@ -1,2 +0,0 @@ -mirror:Source/iscsi-initiator-utils-6.2.0.874-7.el7.src.rpm -