diff --git a/License/LICENSE b/License/LICENSE index 2e51531..ee58399 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 4b3af7d..b658d6c 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# syscontainer-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 +# syscontainer-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: makefile for syscontainer-tools # Author: zhangwei # Create: 2018-01-18 diff --git a/apply-patch b/apply-patch index fdecd8a..43ba000 100644 --- a/apply-patch +++ b/apply-patch @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# syscontainer-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 +# syscontainer-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: apply patch # Author: zhangwei # Create: 2018-01-18 diff --git a/config/config.go b/config/config.go index e29ebef..631474b 100644 --- a/config/config.go +++ b/config/config.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: device hook config // Author: zhangwei // Create: 2018-01-18 diff --git a/config/config_device.go b/config/config_device.go index 09acda8..e2aaa70 100644 --- a/config/config_device.go +++ b/config/config_device.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: device config operation // Author: zhangwei // Create: 2018-01-18 diff --git a/config/config_network.go b/config/config_network.go index c7b1601..4e0da46 100644 --- a/config/config_network.go +++ b/config/config_network.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: network config operation // Author: zhangwei // Create: 2018-01-18 diff --git a/container/container.go b/container/container.go index fba75f2..67f6b53 100644 --- a/container/container.go +++ b/container/container.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: container config operation // Author: zhangwei // Create: 2018-01-18 diff --git a/device.go b/device.go index ab4e637..c212570 100644 --- a/device.go +++ b/device.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: device commands // Author: zhangwei // Create: 2018-01-18 diff --git a/hack/install.sh b/hack/install.sh index 96a1390..ccd3b35 100644 --- a/hack/install.sh +++ b/hack/install.sh @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# syscontainer-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 +# syscontainer-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: make install # Author: zhangwei # Create: 2018-01-18 diff --git a/hack/syscontainer-tools.spec b/hack/syscontainer-tools.spec index 9cc688d..3fc959b 100644 --- a/hack/syscontainer-tools.spec +++ b/hack/syscontainer-tools.spec @@ -4,9 +4,9 @@ #Basic Information Name: syscontainer-tools Version: v0.9 -Release: 36 +Release: 37 Summary: syscontainer tools for IT, work with iSulad -License: Mulan PSL v1 +License: Mulan PSL v2 URL: https://gitee.com/src-openeuler/syscontainer-tools Source0: %{name}-src.tar.gz BuildRoot: %{_tmppath}/%{name}-root @@ -108,6 +108,9 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json rm -rfv %{buildroot} %changelog +* Tue Apr 27 2020 zhangtianyang - 0.9.37 +- update license to Mulan PSL v2 + * Tue Jan 07 2020 Zhangsong - 0.9.35 - Type:enhancement - ID:NA diff --git a/hack/syscontainer-tools_wrapper b/hack/syscontainer-tools_wrapper index fa8626f..671eec3 100644 --- a/hack/syscontainer-tools_wrapper +++ b/hack/syscontainer-tools_wrapper @@ -1,13 +1,13 @@ #!/bin/sh # Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# syscontainer-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 +# syscontainer-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: syscontainer tools wrapper # Author: zhangsong234 # Create: 2020-01-17 diff --git a/hooks/syscontainer-hooks/main.go b/hooks/syscontainer-hooks/main.go index ce193b2..9a4d573 100644 --- a/hooks/syscontainer-hooks/main.go +++ b/hooks/syscontainer-hooks/main.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: syscontainer hook main function // Author: zhangwei // Create: 2018-01-18 diff --git a/hooks/syscontainer-hooks/poststart.go b/hooks/syscontainer-hooks/poststart.go index 838f876..20d7ffa 100644 --- a/hooks/syscontainer-hooks/poststart.go +++ b/hooks/syscontainer-hooks/poststart.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: poststart hook // Author: zhangwei // Create: 2018-01-18 diff --git a/hooks/syscontainer-hooks/poststop.go b/hooks/syscontainer-hooks/poststop.go index 3cac3a0..35f648e 100644 --- a/hooks/syscontainer-hooks/poststop.go +++ b/hooks/syscontainer-hooks/poststop.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: poststop hook // Author: zhangwei // Create: 2018-01-18 diff --git a/hooks/syscontainer-hooks/prestart.go b/hooks/syscontainer-hooks/prestart.go index 43ef6e3..a71d26b 100644 --- a/hooks/syscontainer-hooks/prestart.go +++ b/hooks/syscontainer-hooks/prestart.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: zhangwei // Create: 2018-01-18 diff --git a/hooks/syscontainer-hooks/relabel.go b/hooks/syscontainer-hooks/relabel.go index d5d870b..8444e30 100644 --- a/hooks/syscontainer-hooks/relabel.go +++ b/hooks/syscontainer-hooks/relabel.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: selinux relabel operation // Author: zhangwei // Create: 2018-01-18 diff --git a/libdevice/binds_unix.go b/libdevice/binds_unix.go index be63176..2c45700 100644 --- a/libdevice/binds_unix.go +++ b/libdevice/binds_unix.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: bind operation for device // Author: zhangwei // Create: 2018-01-18 diff --git a/libdevice/cgroup.go b/libdevice/cgroup.go index 3feaae7..3716859 100644 --- a/libdevice/cgroup.go +++ b/libdevice/cgroup.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: cgroup operation for container // Author: zhangwei // Create: 2018-01-18 diff --git a/libdevice/container_work.go b/libdevice/container_work.go index 0d4edbe..050438f 100644 --- a/libdevice/container_work.go +++ b/libdevice/container_work.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: bind and device operation in container namespace // Author: zhangwei // Create: 2018-01-18 diff --git a/libdevice/devices_unix.go b/libdevice/devices_unix.go index 4fe3a33..60df44b 100644 --- a/libdevice/devices_unix.go +++ b/libdevice/devices_unix.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: device operation // Author: zhangwei // Create: 2018-01-18 diff --git a/libdevice/libdevice.go b/libdevice/libdevice.go index b957d49..2401ee3 100644 --- a/libdevice/libdevice.go +++ b/libdevice/libdevice.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: device operation lib // Author: zhangwei // Create: 2018-01-18 diff --git a/libdevice/nsexec/driver.go b/libdevice/nsexec/driver.go index 1249171..8ffc9f3 100644 --- a/libdevice/nsexec/driver.go +++ b/libdevice/nsexec/driver.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: zhangwei // Create: 2018-01-18 diff --git a/libdevice/nsexec/nsexec.go b/libdevice/nsexec/nsexec.go index e6bd0ac..1667ce3 100644 --- a/libdevice/nsexec/nsexec.go +++ b/libdevice/nsexec/nsexec.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: zhangwei // Create: 2018-01-18 diff --git a/libdevice/number.go b/libdevice/number.go index 3403fb8..95ed17a 100644 --- a/libdevice/number.go +++ b/libdevice/number.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: parse device major and minor number // Author: zhangwei // Create: 2018-01-18 diff --git a/libdevice/options.go b/libdevice/options.go index 6b8a783..9735b06 100644 --- a/libdevice/options.go +++ b/libdevice/options.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: parse device option // Author: zhangwei // Create: 2018-01-18 diff --git a/libnetwork/bridge/api/bridge_api.go b/libnetwork/bridge/api/bridge_api.go index 403173e..2cb41e5 100644 --- a/libnetwork/bridge/api/bridge_api.go +++ b/libnetwork/bridge/api/bridge_api.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: bridge driver // Author: zhangwei // Create: 2018-01-18 diff --git a/libnetwork/bridge/bridge.go b/libnetwork/bridge/bridge.go index 58583a5..455e5ba 100644 --- a/libnetwork/bridge/bridge.go +++ b/libnetwork/bridge/bridge.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: init bridge driver // Author: zhangwei // Create: 2018-01-18 diff --git a/libnetwork/bridge/linux/driver.go b/libnetwork/bridge/linux/driver.go index ee5ff46..ebaaac4 100644 --- a/libnetwork/bridge/linux/driver.go +++ b/libnetwork/bridge/linux/driver.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: linux bridge driver implement // Author: zhangwei // Create: 2018-01-18 diff --git a/libnetwork/bridge/ovs/driver.go b/libnetwork/bridge/ovs/driver.go index d110d76..8d58055 100644 --- a/libnetwork/bridge/ovs/driver.go +++ b/libnetwork/bridge/ovs/driver.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: ovs bridge driver implement // Author: zhangwei // Create: 2018-01-18 diff --git a/libnetwork/drivers/common/driver.go b/libnetwork/drivers/common/driver.go index 86e8eb1..c2dadd7 100644 --- a/libnetwork/drivers/common/driver.go +++ b/libnetwork/drivers/common/driver.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: common network driver // Author: zhangwei // Create: 2018-01-18 diff --git a/libnetwork/drivers/driver.go b/libnetwork/drivers/driver.go index 97a6e8d..a87831d 100644 --- a/libnetwork/drivers/driver.go +++ b/libnetwork/drivers/driver.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: network interface driver // Author: zhangwei // Create: 2018-01-18 diff --git a/libnetwork/drivers/eth/driver.go b/libnetwork/drivers/eth/driver.go index 6d5c41f..cd70ddf 100644 --- a/libnetwork/drivers/eth/driver.go +++ b/libnetwork/drivers/eth/driver.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: ethetic network driver // Author: zhangwei // Create: 2018-01-18 diff --git a/libnetwork/drivers/veth/driver.go b/libnetwork/drivers/veth/driver.go index 5ac958c..a485505 100644 --- a/libnetwork/drivers/veth/driver.go +++ b/libnetwork/drivers/veth/driver.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: virtual ethetic network driver // Author: zhangwei // Create: 2018-01-18 diff --git a/libnetwork/interfaces.go b/libnetwork/interfaces.go index c3c71c1..5d3376b 100644 --- a/libnetwork/interfaces.go +++ b/libnetwork/interfaces.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: network interface operation // Author: zhangwei // Create: 2018-01-18 diff --git a/libnetwork/nsutils/ns_utils.go b/libnetwork/nsutils/ns_utils.go index 5a2f746..2f7ce5d 100644 --- a/libnetwork/nsutils/ns_utils.go +++ b/libnetwork/nsutils/ns_utils.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: netns invoke // Author: zhangwei // Create: 2018-01-18 diff --git a/libnetwork/route.go b/libnetwork/route.go index 87aa76f..0be5a76 100644 --- a/libnetwork/route.go +++ b/libnetwork/route.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: network routes operation // Author: zhangwei // Create: 2018-01-18 diff --git a/main.go b/main.go index 63850f1..0a0f808 100644 --- a/main.go +++ b/main.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: zhangwei // Create: 2018-01-18 diff --git a/network.go b/network.go index 809aaa5..e8eaa68 100644 --- a/network.go +++ b/network.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: network interface commands // Author: zhangwei // Create: 2018-01-18 diff --git a/pkg/ethtool/ethtool.c b/pkg/ethtool/ethtool.c index 7754efb..ea06fa2 100644 --- a/pkg/ethtool/ethtool.c +++ b/pkg/ethtool/ethtool.c @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2017-2019. All rights reserved. - * syscontainer-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 + * syscontainer-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. * Author: zhangwentao * Create: 2017-07-19 * Description: config net device tx/sg/tso on diff --git a/pkg/ethtool/ethtool.go b/pkg/ethtool/ethtool.go index 3da4739..93ca5eb 100644 --- a/pkg/ethtool/ethtool.go +++ b/pkg/ethtool/ethtool.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: ethtool for network interface // Author: zhangwei // Create: 2018-01-18 diff --git a/pkg/ethtool/ethtool.h b/pkg/ethtool/ethtool.h index 23d14e6..196820a 100644 --- a/pkg/ethtool/ethtool.h +++ b/pkg/ethtool/ethtool.h @@ -1,13 +1,13 @@ /****************************************************************************** * Copyright (c) Huawei Technologies Co., Ltd. 2017-2019. All rights reserved. - * syscontainer-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 + * syscontainer-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. * Author: zhangwentao * Create: 2017-07-19 * Description: config net device tx/sg/tso on diff --git a/pkg/mount/mount.go b/pkg/mount/mount.go index 66c909e..b09e009 100644 --- a/pkg/mount/mount.go +++ b/pkg/mount/mount.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: recursive unmount // Author: zhangwei // Create: 2018-01-18 diff --git a/pkg/mount/mounter_linux.go b/pkg/mount/mounter_linux.go index 767d2f9..47403b8 100644 --- a/pkg/mount/mounter_linux.go +++ b/pkg/mount/mounter_linux.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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 operation // Author: zhangwei // Create: 2018-01-18 diff --git a/pkg/mount/mountinfo.go b/pkg/mount/mountinfo.go index 92dab8a..a5b6590 100644 --- a/pkg/mount/mountinfo.go +++ b/pkg/mount/mountinfo.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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 point compare implement // Author: zhangwei // Create: 2018-01-18 diff --git a/pkg/udevd/udevd.go b/pkg/udevd/udevd.go index 882795d..22b0cba 100644 --- a/pkg/udevd/udevd.go +++ b/pkg/udevd/udevd.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: udevd rules // Author: zhangwei // Create: 2018-01-18 diff --git a/pkg/udevd/udevd_controller.go b/pkg/udevd/udevd_controller.go index eab5918..d8ca84e 100644 --- a/pkg/udevd/udevd_controller.go +++ b/pkg/udevd/udevd_controller.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: udevd controller // Author: zhangwei // Create: 2018-01-18 diff --git a/relabel.go b/relabel.go index 36975c3..bd9c465 100644 --- a/relabel.go +++ b/relabel.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: selinux relabel commands // Author: zhangwei // Create: 2018-01-18 diff --git a/route.go b/route.go index d9db73a..02a503d 100644 --- a/route.go +++ b/route.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: route commands // Author: zhangwei // Create: 2018-01-18 diff --git a/test/devices_many_test.sh b/test/devices_many_test.sh index bb08797..f03df61 100644 --- a/test/devices_many_test.sh +++ b/test/devices_many_test.sh @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# syscontainer-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 +# syscontainer-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: test mount mutiple direct # Author: zhangwei # Create: 2018-01-18 diff --git a/test/devices_test.sh b/test/devices_test.sh index 5e79e07..2327137 100644 --- a/test/devices_test.sh +++ b/test/devices_test.sh @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# syscontainer-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 +# syscontainer-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: device tests # Author: zhangwei # Create: 2018-01-18 diff --git a/test/env.sh b/test/env.sh index ed6bc56..18fa97c 100644 --- a/test/env.sh +++ b/test/env.sh @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# syscontainer-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 +# syscontainer-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: env tests # Author: zhangwei # Create: 2018-01-18 diff --git a/test/main.sh b/test/main.sh index 0515919..c683e8e 100644 --- a/test/main.sh +++ b/test/main.sh @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# syscontainer-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 +# syscontainer-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 test # Author: zhangwei # Create: 2018-01-18 diff --git a/test/network_test.sh b/test/network_test.sh index 00b2a12..dea79f4 100644 --- a/test/network_test.sh +++ b/test/network_test.sh @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# syscontainer-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 +# syscontainer-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: network test # Author: zhangwei # Create: 2018-01-18 diff --git a/test/network_wrapper.sh b/test/network_wrapper.sh index 9e67426..47e284e 100644 --- a/test/network_wrapper.sh +++ b/test/network_wrapper.sh @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# syscontainer-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 +# syscontainer-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: network wrapper # Author: zhangwei # Create: 2018-01-18 diff --git a/test/path_many_test.sh b/test/path_many_test.sh index 2a4f284..5dc607b 100644 --- a/test/path_many_test.sh +++ b/test/path_many_test.sh @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# syscontainer-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 +# syscontainer-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: test mount mutiple direct # Author: zhangwei # Create: 2018-01-18 diff --git a/test/path_test.sh b/test/path_test.sh index ca2ba5d..6a96cbf 100644 --- a/test/path_test.sh +++ b/test/path_test.sh @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# syscontainer-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 +# syscontainer-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: test up container # Author: zhangwei # Create: 2018-01-18 diff --git a/test/route_test.sh b/test/route_test.sh index d86d233..feebdc9 100644 --- a/test/route_test.sh +++ b/test/route_test.sh @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# syscontainer-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 +# syscontainer-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: test route # Author: zhangwei # Create: 2018-01-18 diff --git a/test/tools.sh b/test/tools.sh index 45f8367..14873eb 100644 --- a/test/tools.sh +++ b/test/tools.sh @@ -1,12 +1,12 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -# syscontainer-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 +# syscontainer-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: test tools # Author: zhangwei # Create: 2018-01-18 diff --git a/types/config.go b/types/config.go index dcb8d16..b3a6ff8 100644 --- a/types/config.go +++ b/types/config.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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 type // Author: zhangwei // Create: 2018-01-18 diff --git a/types/device.go b/types/device.go index f913763..98be437 100644 --- a/types/device.go +++ b/types/device.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: device and bind type // Author: zhangwei // Create: 2018-01-18 diff --git a/types/network.go b/types/network.go index 34a5a48..74231f9 100644 --- a/types/network.go +++ b/types/network.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: network interface type // Author: zhangwei // Create: 2018-01-18 diff --git a/utils/hooks.go b/utils/hooks.go index 21550b9..6faa4b3 100644 --- a/utils/hooks.go +++ b/utils/hooks.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: hook utils // Author: zhangwei // Create: 2018-01-18 diff --git a/utils/selinux.go b/utils/selinux.go index f432b24..4100985 100644 --- a/utils/selinux.go +++ b/utils/selinux.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: selinux utils // Author: zhangwei // Create: 2018-01-18 diff --git a/utils/transfer.go b/utils/transfer.go index 9c6d527..81f0498 100644 --- a/utils/transfer.go +++ b/utils/transfer.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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 transfer utils // Author: zhangwei // Create: 2018-01-18 diff --git a/utils/utils.go b/utils/utils.go index c774da0..20ba1ee 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: common utils // Author: zhangwei // Create: 2018-01-18 diff --git a/volume.go b/volume.go index a4a3399..bd5b8a4 100644 --- a/volume.go +++ b/volume.go @@ -1,12 +1,12 @@ // Copyright (c) Huawei Technologies Co., Ltd. 2018-2019. All rights reserved. -// syscontainer-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 +// syscontainer-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: path/volume commands // Author: zhangwei // Create: 2018-01-18