From ff151c1e10ca0a93a27f5de470773218876dc8df Mon Sep 17 00:00:00 2001 From: Scott Little Date: Wed, 1 Aug 2018 12:20:00 -0400 Subject: [PATCH] Relocate filesystem-scripts to stx-integ/filesystem/filesystem-scripts Move content from stx-utils into stx-integ or stx-update Packages will be relocated to stx-update: enable-dev-patch extras stx-integ: config-files/ io-scheduler filesystem/ filesystem-scripts grub/ grubby logging/ logmgmt tools/ collector monitor-tools tools/engtools/ hostdata-collectors parsers utilities/ build-info branding (formerly wrs-branding) platform-util Change-Id: Ibe779e1af74706ca33e3fc80307b0cafcd0f6ca0 Story: 2002801 Task: 22687 --- centos_pkg_dirs | 1 - .../filesystem-scripts/.gitignore | 6 - .../filesystem-scripts/LICENSE | 202 ------------ .../filesystem-scripts/PKG-INFO | 13 - .../filesystem-scripts/centos/build_srpm.data | 3 - .../centos/filesystem-scripts.spec | 56 ---- .../filesystem-scripts-1.0/LICENSE | 202 ------------ .../filesystem-scripts-1.0/nfs-mount | 81 ----- .../filesystem-scripts-1.0/nfsserver-mgmt | 307 ------------------ .../filesystem-scripts-1.0/uexportfs | 19 -- .../filesystem-scripts-1.0/uexportfs.service | 12 - 11 files changed, 902 deletions(-) delete mode 100644 middleware/filesystem/recipes-control/filesystem-scripts/.gitignore delete mode 100644 middleware/filesystem/recipes-control/filesystem-scripts/LICENSE delete mode 100644 middleware/filesystem/recipes-control/filesystem-scripts/PKG-INFO delete mode 100644 middleware/filesystem/recipes-control/filesystem-scripts/centos/build_srpm.data delete mode 100644 middleware/filesystem/recipes-control/filesystem-scripts/centos/filesystem-scripts.spec delete mode 100644 middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/LICENSE delete mode 100644 middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/nfs-mount delete mode 100644 middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/nfsserver-mgmt delete mode 100644 middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/uexportfs delete mode 100644 middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/uexportfs.service diff --git a/centos_pkg_dirs b/centos_pkg_dirs index d73b739..fe4bc7e 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -1,4 +1,3 @@ -middleware/filesystem/recipes-control/filesystem-scripts middleware/io-monitor/recipes-common/io-monitor middleware/recipes-common/build-info middleware/branding/recipes-control/wrs-branding diff --git a/middleware/filesystem/recipes-control/filesystem-scripts/.gitignore b/middleware/filesystem/recipes-control/filesystem-scripts/.gitignore deleted file mode 100644 index c03fe64..0000000 --- a/middleware/filesystem/recipes-control/filesystem-scripts/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -!.distro -.distro/centos7/rpmbuild/RPMS -.distro/centos7/rpmbuild/SRPMS -.distro/centos7/rpmbuild/BUILD -.distro/centos7/rpmbuild/BUILDROOT -.distro/centos7/rpmbuild/SOURCES/filesystem-scripts*tar.gz diff --git a/middleware/filesystem/recipes-control/filesystem-scripts/LICENSE b/middleware/filesystem/recipes-control/filesystem-scripts/LICENSE deleted file mode 100644 index d645695..0000000 --- a/middleware/filesystem/recipes-control/filesystem-scripts/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/middleware/filesystem/recipes-control/filesystem-scripts/PKG-INFO b/middleware/filesystem/recipes-control/filesystem-scripts/PKG-INFO deleted file mode 100644 index 5643c29..0000000 --- a/middleware/filesystem/recipes-control/filesystem-scripts/PKG-INFO +++ /dev/null @@ -1,13 +0,0 @@ -Metadata-Version: 1.1 -Name: filesystem-scripts -Version: 1.0 -Summary: File System Script Package -Home-page: -Author: Windriver -Author-email: info@windriver.com -License: Apache-2.0 - -Description: File System Script Package - - -Platform: UNKNOWN diff --git a/middleware/filesystem/recipes-control/filesystem-scripts/centos/build_srpm.data b/middleware/filesystem/recipes-control/filesystem-scripts/centos/build_srpm.data deleted file mode 100644 index 04f8d4f..0000000 --- a/middleware/filesystem/recipes-control/filesystem-scripts/centos/build_srpm.data +++ /dev/null @@ -1,3 +0,0 @@ -SRC_DIR="filesystem-scripts-1.0" -COPY_LIST="$PKG_BASE/LICENSE" -TIS_PATCH_VER=2 diff --git a/middleware/filesystem/recipes-control/filesystem-scripts/centos/filesystem-scripts.spec b/middleware/filesystem/recipes-control/filesystem-scripts/centos/filesystem-scripts.spec deleted file mode 100644 index 07a4e60..0000000 --- a/middleware/filesystem/recipes-control/filesystem-scripts/centos/filesystem-scripts.spec +++ /dev/null @@ -1,56 +0,0 @@ -Summary: File System Script Package -Name: filesystem-scripts -Version: 1.0 -Release: %{tis_patch_ver}%{?_tis_dist} -License: Apache-2.0 -Group: base -Packager: Wind River -URL: unknown -Source0: %{name}-%{version}.tar.gz -Source1: LICENSE - -BuildRequires: systemd-devel -Requires: /bin/systemctl - -%description -File System Script Package - -%define local_bindir /usr/bin/ -%define local_etc_initd /etc/init.d/ -%define local_ocfdir /usr/lib/ocf/resource.d/platform/ - -%define debug_package %{nil} - -%prep -%setup - -%build - -%install - -install -d -m 755 %{buildroot}%{local_etc_initd} -install -p -D -m 755 uexportfs %{buildroot}%{local_etc_initd}/uexportfs - -install -d -m 755 %{buildroot}%{local_ocfdir} -install -p -D -m 755 nfsserver-mgmt %{buildroot}%{local_ocfdir}/nfsserver-mgmt - -install -d -m 755 %{buildroot}%{local_bindir} -install -p -D -m 755 nfs-mount %{buildroot}%{local_bindir}/nfs-mount - -install -p -D -m 644 uexportfs.service %{buildroot}%{_unitdir}/uexportfs.service - -%post -/bin/systemctl enable uexportfs.service - - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%license LICENSE -%defattr(-,root,root,-) -%{local_bindir}/* -%{local_etc_initd}/* -%dir %{local_ocfdir} -%{local_ocfdir}/* -%{_unitdir}/uexportfs.service diff --git a/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/LICENSE b/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/LICENSE deleted file mode 100644 index d645695..0000000 --- a/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/nfs-mount b/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/nfs-mount deleted file mode 100644 index dc35a20..0000000 --- a/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/nfs-mount +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2015 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -# -# This utility is a wrapper around mount, to provide a single script -# with preferred options for NFS mounting. It takes exactly two arguments: -# - network source path -# - local destination path -# - -function show_help() -{ - cat >&2 << EOF -$(basename $0): - Wrapper around "mount" to provide a set of default options for NFS mounts. - This utility takes exactly two arguments: - - network source path - - local destination path - -EOF - exit 1 -} - -function get_proto() -{ - local host=$1 - - # Check /etc/hosts for the hostname - local ipaddr=$(cat /etc/hosts | awk -v host=$host '$2 == host {print $1}') - if [[ "$ipaddr" =~ ^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$ ]] - then - echo "udp" - return - fi - if [[ "$ipaddr" =~ ^[0-9a-z]*\:[0-9a-z\:]*$ ]] - then - echo "udp6" - return - fi - # Try the DNS query - ipaddr=$(dig +short ANY $host) - if [[ "$ipaddr" =~ ^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$ ]] - then - echo "udp" - return - fi - if [[ "$ipaddr" =~ ^[0-9a-z]*\:[0-9a-z\:]*$ ]] - then - echo "udp6" - return - fi - - # Use default of udp to avoid invalid option - echo "udp" - return -} - - -if [[ ${BASH_ARGC[0]} != 2 ]] -then - show_help -fi - -if mountpoint -q $2 -then - echo "$2 is already mounted. Not mounting." - exit -fi - -HOST=`echo $1|awk -F ':' '{print $1}'` -declare proto=`get_proto $HOST` -declare -i timeo=30 -declare -i rw_size=1024 -declare DEFAULT_OPTS="timeo=$timeo,proto=$proto,vers=3,rsize=$rw_size,wsize=$rw_size" - -exec mount -t nfs -o $DEFAULT_OPTS $1 $2 - diff --git a/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/nfsserver-mgmt b/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/nfsserver-mgmt deleted file mode 100644 index 1bd26f8..0000000 --- a/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/nfsserver-mgmt +++ /dev/null @@ -1,307 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2013-2014 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# -# -# Support: www.windriver.com -# -# Purpose: This resource agent manages File System Service -# -# RA Spec: -# -# http://www.opencf.org/cgi-bin/viewcvs.cgi/specs/ra/resource-agent-api.txt?rev=HEAD -# -####################################################################### -# Initialization: - -: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat} -. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs - -####################################################################### - -####################################################################### - -usage() { - cat < - - -1.0 - - - This OCF Compliant Resource Agent makes sure the nfs server is in the - correct state. - - - -Makes sure the NFS Server is in the correct state. - - - - -List of exports that should not be exported anymore -List of exports - - - - -List of mounts that should not be mounted anymore -List of mounts - - - - - - - - - - - - -END - return ${OCF_SUCCESS} -} - -nfs_server_mgmt_validate() { - check_binary service - check_binary grep - check_binary cat - check_binary exportfs - check_binary fuser - check_binary mount - check_binary umount - check_binary logger - return ${OCF_SUCCESS} -} - -nfs_server_mgmt_status() { - return ${OCF_NOT_RUNNING} -} - -nfs_server_mgmt_monitor () { - return ${OCF_NOT_RUNNING} -} - -check_exportfs () { - local CLIENTSPEC_DIR=$1 - local rc - - OLD_IFS="${IFS}" - IFS=":" - STR_ARRAY=( $CLIENTSPEC_DIR ) - IFS="${OLD_IFS}" - - CLIENTSPEC=${STR_ARRAY[0]} - DIR=${STR_ARRAY[1]} - - cat /proc/fs/nfsd/exports | grep "${CLIENTSPEC}" | grep "${DIR}" > /dev/null 2>&1 - rc=$? - if [ ${rc} -eq 0 ] - then - return 1 - fi - - exportfs | grep "${CLIENTSPEC}" | grep "${DIR}" > /dev/null 2>&1 - rc=$? - if [ ${rc} -eq 0 ] - then - return 1 - fi - - return 0 -} - -do_nfs_restart () { - while true - do - ocf_log info "NFS Server restart" - service nfsserver restart - ocf_log info "NFS Server restart complete" - - service nfsserver status | grep stopped > /dev/null 2>&1 || { - ocf_log info "NFS Server is now running" - return ${OCF_SUCCESS} - } - - ocf_log error "NFS Server still not running" - sleep 5 - done -} - -do_umount () { - local DEV_DIR=$1 - - OLD_IFS="${IFS}" - IFS=":" - STR_ARRAY=( $DEV_DIR ) - IFS="${OLD_IFS}" - - DEV=${STR_ARRAY[0]} - DIR=${STR_ARRAY[1]} - - mount | grep "${DEV}" | grep "${DIR}" > /dev/null 2>&1 || { - ocf_log info "${DEV} ${DIR} not mounted" - return ${OCF_SUCCESS} - } - - ocf_log info "umount on ${DEV} ${DIR}" - umount ${DEV} ${DIR} > /dev/null 2>&1 - - while true - do - mount | grep "${DEV}" | grep "${DIR}" > /dev/null 2>&1 || { - ocf_log info "unmounted ${DEV} ${DIR} successfully" - return ${OCF_SUCCESS} - } - - if fuser -KILL -m -k ${DIR} - then - ocf_log info "Processes killed using ${DEV} ${DIR}" - else - ocf_log info "No processes using ${DEV} ${DIR}" - fi - - ocf_log info "umount force on ${DEV} ${DIR}" - umount -f ${DEV} ${DIR} > /dev/null 2>&1 - - sleep 2 - - mount | grep "${DEV}" | grep "${DIR}" > /dev/null 2>&1 || { - ocf_log info "unmounted ${DEV} ${DIR} successfully" - return ${OCF_SUCCESS} - } - - do_nfs_restart - done - - return ${OCF_SUCCESS} -} - -nfs_server_mgmt_start () { - service nfsserver status | grep stopped > /dev/null 2>&1 || { - ocf_log info "NFS Server is running" - return ${OCF_SUCCESS} - } - - ocf_log error "NFS Server not running, restarting" - do_nfs_restart - return $? -} - -nfs_server_mgmt_stop () { - local need_nfs_restart=0 - local rc - - # Make sure exports are stopped... - while IFS=',' read -ra CLIENTSPEC_DIRS - do - for CLIENTSPEC_DIR in "${CLIENTSPEC_DIRS[@]}" - do - check_exportfs ${CLIENTSPEC_DIR} - rc=$? - if [ ${rc} -eq 1 ] - then - ocf_log info "export ${CLIENTSPEC_DIR} found" - let need_nfs_restart=1 - fi - done - done <<< "${OCF_RESKEY_exports}" - - if [ ${need_nfs_restart} -ne 0 ] - then - do_nfs_restart - rc=$? - if [ ${rc} -ne ${OCF_SUCCESS} ] - then - return ${rc} - fi - fi - - # Make sure mounts are not mounted. - while IFS=',' read -ra MOUNTS - do - for MOUNT in "${MOUNTS[@]}" - do - do_umount ${MOUNT} - done - done <<< "${OCF_RESKEY_mounts}" - - return ${OCF_SUCCESS} -} - -nfs_server_mgmt_reload () { - local rc - - nfs_server_mgmt_stop - rc=$? - if [ $rc -eq ${OCF_SUCCESS} ] - then - nfs_server_mgmt_start - rc=$? - if [ $rc -eq ${OCF_SUCCESS} ] - then - ocf_log info "NFS Server Managment reloaded" - fi - fi - - if [ ${rc} -ne ${OCF_SUCCESS} ] - then - ocf_log info "NFS Server Managment reload failed (rc=${rc})" - fi - - return ${rc} -} - -case ${__OCF_ACTION} in - meta-data) meta_data - exit ${OCF_SUCCESS} - ;; - usage|help) usage - exit ${OCF_SUCCESS} - ;; -esac - -# Anything except meta-data and help must pass validation -nfs_server_mgmt_validate || exit $? - -case ${__OCF_ACTION} in - start) nfs_server_mgmt_start - ;; - stop) nfs_server_mgmt_stop - ;; - status) nfs_server_mgmt_status - ;; - reload) nfs_server_mgmt_reload - ;; - monitor) nfs_server_mgmt_monitor - ;; - validate-all) nfs_server_mgmt_validate - ;; - *) usage - exit ${OCF_ERR_UNIMPLEMENTED} - ;; -esac diff --git a/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/uexportfs b/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/uexportfs deleted file mode 100644 index ba3c103..0000000 --- a/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/uexportfs +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh -# -# Copyright (c) 2013-2014 Wind River Systems, Inc. -# -# SPDX-License-Identifier: Apache-2.0 -# - -### BEGIN INIT INFO -# Provides: uexportfs -# Default-Start: 3 -# Default-Stop: -# Short-Description: Used to remove all exported filesystems on a boot -### END INIT INFO - -PATH=/sbin:/bin:/usr/sbin:/usr/bin - -exportfs -r > /dev/null 2>&1 - -: exit 0 diff --git a/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/uexportfs.service b/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/uexportfs.service deleted file mode 100644 index d687ad6..0000000 --- a/middleware/filesystem/recipes-control/filesystem-scripts/filesystem-scripts-1.0/uexportfs.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Titanium Cloud Filesystem Initialization -After=network.target nfscommon.service - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/etc/init.d/uexportfs start -ExecStop=/etc/init.d/uexportfs stop - -[Install] -WantedBy=multi-user.target