diff --git a/License/LICENSE b/License/LICENSE index 2e51531a71f149e4a1f99842722350b307ce03ee..ee5839968a2bf86c93283efc09d40fd050b7cfa2 100644 --- a/License/LICENSE +++ b/License/LICENSE @@ -1,121 +1,127 @@ - 木兰宽松许可证, 第1版 - - 木兰宽松许可证， 第1版 - 2019年8月 http://license.coscl.org.cn/MulanPSL - - 您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第1版（“本许可证”）的如下条款的约束： - - 0. 定义 - - “软件”是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。 - - “贡献者”是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。 - - “法人实体”是指提交贡献的机构及其“关联实体”。 - - “关联实体”是指，对“本许可证”下的一方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。 - - “贡献”是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。 - - 1. 授予版权许可 - - 每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。 - - 2. 授予专利许可 - - 每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括仅因您或他人修改“贡献”或其他结合而将必然会侵犯到的专利权利要求。如您或您的“关联实体”直接或间接地（包括通过代理、专利被许可人或受让人），就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。 - - 3. 无商标许可 - - “本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。 - - 4. 分发限制 - - 您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。 - - 5. 免责声明与责任限制 - - “软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。 - - 条款结束。 - - 如何将木兰宽松许可证，第1版，应用到您的软件 - - 如果您希望将木兰宽松许可证，第1版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步： - - 1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字； - - 2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中； - - 3， 请将如下声明文本放入每个源文件的头部注释中。 - - Copyright (c) [2019] [name of copyright holder] - [Software Name] is licensed under the Mulan PSL v1. - You can use this software according to the terms and conditions of the Mulan PSL v1. - You may obtain a copy of Mulan PSL v1 at: - http://license.coscl.org.cn/MulanPSL - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR - PURPOSE. - See the Mulan PSL v1 for more details. - - - Mulan Permissive Software License，Version 1 - - Mulan Permissive Software License，Version 1 (Mulan PSL v1) - August 2019 http://license.coscl.org.cn/MulanPSL - - Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v1 (this License) with following terms and conditions: - - 0. Definition - - Software means the program and related documents which are comprised of those Contribution and licensed under this License. - - Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License. - - Legal Entity means the entity making a Contribution and all its Affiliates. - - Affiliates means entities that control, or are controlled by, or are under common control with a party to this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity. - - Contribution means the copyrightable work licensed by a particular Contributor under this License. - - 1. Grant of Copyright License - - Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not. - - 2. Grant of Patent License - - Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed, excluding of any patent claims solely be infringed by your or others’ modification or other combinations. If you or your Affiliates directly or indirectly (including through an agent, patent licensee or assignee）, institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken. - - 3. No Trademark License - - No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in section 4. - - 4. Distribution Restriction - - You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software. - - 5. Disclaimer of Warranty and Limitation of Liability - - The Software and Contribution in it are provided without warranties of any kind, either express or implied. In no event shall any Contributor or copyright holder be liable to you for any damages, including, but not limited to any direct, or indirect, special or consequential damages arising from your use or inability to use the Software or the Contribution in it, no matter how it’s caused or based on which legal theory, even if advised of the possibility of such damages. - - End of the Terms and Conditions - - How to apply the Mulan Permissive Software License，Version 1 (Mulan PSL v1) to your software - - To apply the Mulan PSL v1 to your work, for easy identification by recipients, you are suggested to complete following three steps: - - i. Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner; - ii. Create a file named “LICENSE” which contains the whole context of this License in the first directory of your software package; - iii. Attach the statement to the appropriate annotated syntax at the beginning of each source file. - - Copyright (c) [2019] [name of copyright holder] - [Software Name] is licensed under the Mulan PSL v1. - You can use this software according to the terms and conditions of the Mulan PSL v1. - You may obtain a copy of Mulan PSL v1 at: - http://license.coscl.org.cn/MulanPSL - THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR - PURPOSE. - - See the Mulan PSL v1 for more details. + 木兰宽松许可证, 第2版 + + 木兰宽松许可证， 第2版 + 2020年1月 http://license.coscl.org.cn/MulanPSL2 + + + 您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束： + + 0. 定义 + + “软件”是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。 + + “贡献”是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。 + + “贡献者”是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。 + + “法人实体”是指提交贡献的机构及其“关联实体”。 + + “关联实体”是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。 + + 1. 授予版权许可 + + 每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。 + + 2. 授予专利许可 + + 每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。 + + 3. 无商标许可 + + “本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。 + + 4. 分发限制 + + 您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。 + + 5. 免责声明与责任限制 + + “软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论，即使其曾被建议有此种损失的可能性。 + + 6. 语言 + “本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。 + + 条款结束 + + 如何将木兰宽松许可证，第2版，应用到您的软件 + + 如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步： + + 1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字； + + 2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中； + + 3， 请将如下声明文本放入每个源文件的头部注释中。 + + Copyright (c) [Year] [name of copyright holder] + [Software Name] is licensed under Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. + + + Mulan Permissive Software License，Version 2 + + Mulan Permissive Software License，Version 2 (Mulan PSL v2) + January 2020 http://license.coscl.org.cn/MulanPSL2 + + Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions: + + 0. Definition + + Software means the program and related documents which are licensed under this License and comprise all Contribution(s). + + Contribution means the copyrightable work licensed by a particular Contributor under this License. + + Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License. + + Legal Entity means the entity making a Contribution and all its Affiliates. + + Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity. + + 1. Grant of Copyright License + + Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not. + + 2. Grant of Patent License + + Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken. + + 3. No Trademark License + + No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in Section 4. + + 4. Distribution Restriction + + You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software. + + 5. Disclaimer of Warranty and Limitation of Liability + + THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + 6. Language + + THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL. + + END OF THE TERMS AND CONDITIONS + + How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) to Your Software + + To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps: + + i Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner; + + ii Create a file named “LICENSE” which contains the whole context of this License in the first directory of your software package; + + iii Attach the statement to the appropriate annotated syntax at the beginning of each source file. + + + Copyright (c) [Year] [name of copyright holder] + [Software Name] is licensed under Mulan PSL v2. + You can use this software according to the terms and conditions of the Mulan PSL v2. + You may obtain a copy of Mulan PSL v2 at: + http://license.coscl.org.cn/MulanPSL2 + THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE. + See the Mulan PSL v2 for more details. diff --git a/Makefile b/Makefile index 3eb27a35c9a18c6fb0a2aedc62af8d66cb34b66b..98f153c43e88e1de5ce2eae6755af9c54413d7b1 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -# lxcfs-tools is licensed under the Mulan PSL v1. -# You can use this software according to the terms and conditions of the Mulan PSL v1. -# You may obtain a copy of Mulan PSL v1 at: +# lxcfs-tools is licensed under the Mulan PSL v2. +# You can use this software according to the terms and conditions of the Mulan PSL v2. +# You may obtain a copy of Mulan PSL v2 at: # http://license.coscl.org.cn/MulanPSL # THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR # PURPOSE. -# See the Mulan PSL v1 for more details. +# See the Mulan PSL v2 for more details. # Description: makefile # Author: zhangsong # Create: 2019-01-18 diff --git a/hack/install.sh b/hack/install.sh index 1ec1dfb6b064bccadfb4d14327948f446eee3635..8fc95e1fbc5e288a643122bbaf3e6dc598f9d1c7 100644 --- a/hack/install.sh +++ b/hack/install.sh @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -# lxcfs-tools is licensed under the Mulan PSL v1. -# You can use this software according to the terms and conditions of the Mulan PSL v1. -# You may obtain a copy of Mulan PSL v1 at: +# lxcfs-tools is licensed under the Mulan PSL v2. +# You can use this software according to the terms and conditions of the Mulan PSL v2. +# You may obtain a copy of Mulan PSL v2 at: # http://license.coscl.org.cn/MulanPSL # THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR # IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR # PURPOSE. -# See the Mulan PSL v1 for more details. +# See the Mulan PSL v2 for more details. # Description: install script # Author: zhangsong # Create: 2019-01-18 diff --git a/hack/lxcfs-tools.spec b/hack/lxcfs-tools.spec index f4292c28ca97285026e8230c2ba33d0017d7717f..d4c8adfe9e07ab5b26604104e26c9a3f39a09192 100644 --- a/hack/lxcfs-tools.spec +++ b/hack/lxcfs-tools.spec @@ -4,9 +4,9 @@ #Basic Information Name: lxcfs-tools Version: 0.3 -Release: 16 +Release: 17 Summary: toolkit for lxcfs to remount a running isulad -License: Mulan PSL v1 +License: Mulan PSL v2 URL: https://gitee.com/src-openeuler/lxcfs-tools Source0: %{name}.tar.gz BuildRoot: %{_tmppath}/%{name}-root @@ -99,6 +99,9 @@ rm -rfv %{buildroot} %changelog +* Tue Apr 27 2020 zhangtianyang - 0.3.17 +- update license to Mulan PSL v2 + * Tue Jan 7 2020 Zhangsong - 0.3.16 - update package diff --git a/hooks/lxcfs-hook/execmount.go b/hooks/lxcfs-hook/execmount.go index 73149f7f80ac44fc3d09324c61089ec2299f4e78..1e26b1a9af7d0b6e0146f8166730f04eb1dc0da4 100644 --- a/hooks/lxcfs-hook/execmount.go +++ b/hooks/lxcfs-hook/execmount.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -// lxcfs-tools is licensed under the Mulan PSL v1. -// You can use this software according to the terms and conditions of the Mulan PSL v1. -// You may obtain a copy of Mulan PSL v1 at: -// http://license.coscl.org.cn/MulanPSL +// lxcfs-tools is licensed under the Mulan PSL v2. +// You can use this software according to the terms and conditions of the Mulan PSL v2. +// You may obtain a copy of Mulan PSL v2 at: +// http://license.coscl.org.cn/MulanPSL2 // THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR // PURPOSE. -// See the Mulan PSL v1 for more details. +// See the Mulan PSL v2 for more details. // Description: exec prestart mount hook // Author: zhangsong // Create: 2019-01-18 diff --git a/hooks/lxcfs-hook/main.go b/hooks/lxcfs-hook/main.go index f23a4458a7575033d756d59ff44a035d637126ad..b661c28b1c34dc90bb6f3e659867da67c4cf0f70 100644 --- a/hooks/lxcfs-hook/main.go +++ b/hooks/lxcfs-hook/main.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -// lxcfs-tools is licensed under the Mulan PSL v1. -// You can use this software according to the terms and conditions of the Mulan PSL v1. -// You may obtain a copy of Mulan PSL v1 at: -// http://license.coscl.org.cn/MulanPSL +// lxcfs-tools is licensed under the Mulan PSL v2. +// You can use this software according to the terms and conditions of the Mulan PSL v2. +// You may obtain a copy of Mulan PSL v2 at: +// http://license.coscl.org.cn/MulanPSL2 // THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR // PURPOSE. -// See the Mulan PSL v1 for more details. +// See the Mulan PSL v2 for more details. // Description: prestart hook // Author: zhangsong // Create: 2019-01-18 diff --git a/hooks/lxcfs-hook/utils/utils.go b/hooks/lxcfs-hook/utils/utils.go index cee4523bf5e22a2f2e54d0c282b04313472a6f55..f4620113a9c752432d2ba09ba392919ed87a290a 100644 --- a/hooks/lxcfs-hook/utils/utils.go +++ b/hooks/lxcfs-hook/utils/utils.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -// lxcfs-tools is licensed under the Mulan PSL v1. -// You can use this software according to the terms and conditions of the Mulan PSL v1. -// You may obtain a copy of Mulan PSL v1 at: -// http://license.coscl.org.cn/MulanPSL +// lxcfs-tools is licensed under the Mulan PSL v2. +// You can use this software according to the terms and conditions of the Mulan PSL v2. +// You may obtain a copy of Mulan PSL v2 at: +// http://license.coscl.org.cn/MulanPSL2 // THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR // PURPOSE. -// See the Mulan PSL v1 for more details. +// See the Mulan PSL v2 for more details. // Description: utils // Author: zhangsong // Create: 2019-01-18 diff --git a/libmount/container_work.go b/libmount/container_work.go index f10a547b25e07d86baa22bba6dd118e7b340bda6..0d5423ed0474783a9985bcfb6a852be96ddf79db 100644 --- a/libmount/container_work.go +++ b/libmount/container_work.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -// lxcfs-tools is licensed under the Mulan PSL v1. -// You can use this software according to the terms and conditions of the Mulan PSL v1. -// You may obtain a copy of Mulan PSL v1 at: -// http://license.coscl.org.cn/MulanPSL +// lxcfs-tools is licensed under the Mulan PSL v2. +// You can use this software according to the terms and conditions of the Mulan PSL v2. +// You may obtain a copy of Mulan PSL v2 at: +// http://license.coscl.org.cn/MulanPSL2 // THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR // PURPOSE. -// See the Mulan PSL v1 for more details. +// See the Mulan PSL v2 for more details. // Description: mount/umount in container namespace // Author: zhangsong // Create: 2019-05-31 diff --git a/libmount/libmount.go b/libmount/libmount.go index 3cbde7796411067f1bd005aa03aafb6b1ed65ba0..3d3ccc08fb00e171228872dc88c2eeebb2a512c2 100644 --- a/libmount/libmount.go +++ b/libmount/libmount.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -// lxcfs-tools is licensed under the Mulan PSL v1. -// You can use this software according to the terms and conditions of the Mulan PSL v1. -// You may obtain a copy of Mulan PSL v1 at: -// http://license.coscl.org.cn/MulanPSL +// lxcfs-tools is licensed under the Mulan PSL v2. +// You can use this software according to the terms and conditions of the Mulan PSL v2. +// You may obtain a copy of Mulan PSL v2 at: +// http://license.coscl.org.cn/MulanPSL2 // THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR // PURPOSE. -// See the Mulan PSL v1 for more details. +// See the Mulan PSL v2 for more details. // Description: mount/umount in container namespace // Author: zhangsong // Create: 2019-05-31 diff --git a/libmount/nsexec/driver.go b/libmount/nsexec/driver.go index 787df850c5855f73ce66c314a8f23104d824179d..9361c9b48a4af8d17648b68787cae672dc12ad91 100644 --- a/libmount/nsexec/driver.go +++ b/libmount/nsexec/driver.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -// lxcfs-tools is licensed under the Mulan PSL v1. -// You can use this software according to the terms and conditions of the Mulan PSL v1. -// You may obtain a copy of Mulan PSL v1 at: -// http://license.coscl.org.cn/MulanPSL +// lxcfs-tools is licensed under the Mulan PSL v2. +// You can use this software according to the terms and conditions of the Mulan PSL v2. +// You may obtain a copy of Mulan PSL v2 at: +// http://license.coscl.org.cn/MulanPSL2 // THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR // PURPOSE. -// See the Mulan PSL v1 for more details. +// See the Mulan PSL v2 for more details. // Description: ns exec driver // Author: zhangsong // Create: 2019-05-31 diff --git a/libmount/nsexec/nsexec.go b/libmount/nsexec/nsexec.go index 0d4b7783b3852e7eb6828c5a088e5e6035e76d56..849bc399e0eaad9828dce08ae49d5f580882572a 100644 --- a/libmount/nsexec/nsexec.go +++ b/libmount/nsexec/nsexec.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -// lxcfs-tools is licensed under the Mulan PSL v1. -// You can use this software according to the terms and conditions of the Mulan PSL v1. -// You may obtain a copy of Mulan PSL v1 at: -// http://license.coscl.org.cn/MulanPSL +// lxcfs-tools is licensed under the Mulan PSL v2. +// You can use this software according to the terms and conditions of the Mulan PSL v2. +// You may obtain a copy of Mulan PSL v2 at: +// http://license.coscl.org.cn/MulanPSL2 // THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR // PURPOSE. -// See the Mulan PSL v1 for more details. +// See the Mulan PSL v2 for more details. // Description: ns exec in container namespace // Author: zhangsong // Create: 2019-05-31 diff --git a/main.go b/main.go index ec26c70f8babe55e716c744ece59f2e096a047d2..5a96d178d80b0d327e13e32bf3b9dfe99d69b2f9 100644 --- a/main.go +++ b/main.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -// lxcfs-tools is licensed under the Mulan PSL v1. -// You can use this software according to the terms and conditions of the Mulan PSL v1. -// You may obtain a copy of Mulan PSL v1 at: -// http://license.coscl.org.cn/MulanPSL +// lxcfs-tools is licensed under the Mulan PSL v2. +// You can use this software according to the terms and conditions of the Mulan PSL v2. +// You may obtain a copy of Mulan PSL v2 at: +// http://license.coscl.org.cn/MulanPSL2 // THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR // PURPOSE. -// See the Mulan PSL v1 for more details. +// See the Mulan PSL v2 for more details. // Description: main funtion // Author: zhangsong // Create: 2019-01-18 diff --git a/remountcmd.go b/remountcmd.go index 5aedab68a782a700145607ebdc1cd4ec4467748b..7cf42c607245f8a6f96b1426d627fd14826d63d3 100644 --- a/remountcmd.go +++ b/remountcmd.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -// lxcfs-tools is licensed under the Mulan PSL v1. -// You can use this software according to the terms and conditions of the Mulan PSL v1. -// You may obtain a copy of Mulan PSL v1 at: -// http://license.coscl.org.cn/MulanPSL +// lxcfs-tools is licensed under the Mulan PSL v2. +// You can use this software according to the terms and conditions of the Mulan PSL v2. +// You may obtain a copy of Mulan PSL v2 at: +// http://license.coscl.org.cn/MulanPSL2 // THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR // PURPOSE. -// See the Mulan PSL v1 for more details. +// See the Mulan PSL v2 for more details. // Description: remount command // Author: zhangsong // Create: 2019-01-18 diff --git a/umountcmd.go b/umountcmd.go index 8fd08eaa6a1338c9957e0acb9ff134cdc3dca5ef..82ff67882f2e798d77dcf4561d8b6349b8dceea9 100644 --- a/umountcmd.go +++ b/umountcmd.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2019. All rights reserved. -// lxcfs-tools is licensed under the Mulan PSL v1. -// You can use this software according to the terms and conditions of the Mulan PSL v1. -// You may obtain a copy of Mulan PSL v1 at: -// http://license.coscl.org.cn/MulanPSL +// lxcfs-tools is licensed under the Mulan PSL v2. +// You can use this software according to the terms and conditions of the Mulan PSL v2. +// You may obtain a copy of Mulan PSL v2 at: +// http://license.coscl.org.cn/MulanPSL2 // THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR // IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR // PURPOSE. -// See the Mulan PSL v1 for more details. +// See the Mulan PSL v2 for more details. // Description: umount command // Author: zhangsong // Create: 2019-01-18