diff options
| author | Jon Grimm <jon.grimm@canonical.com> | 2016-11-22 17:09:53 -0600 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-12-22 17:04:28 -0500 |
| commit | b2a9f33616c806ae6e052520a8589113308f567c (patch) | |
| tree | e24d64e56104dfa1b608a9f255c9b8f618e45cc0 /cloudinit/net/cmdline.py | |
| parent | 0b0f254a6935a1b1fff128fa177152dd519e1a3d (diff) | |
| download | vyos-cloud-init-b2a9f33616c806ae6e052520a8589113308f567c.tar.gz vyos-cloud-init-b2a9f33616c806ae6e052520a8589113308f567c.zip | |
LICENSE: Allow dual licensing GPL-3 or Apache 2.0
This has been a recurring ask and we had initially just made the change to
the cloud-init 2.0 codebase. As the current thinking is we'll just
continue to enhance the current codebase, its desirable to relicense to
match what we'd intended as part of the 2.0 plan here.
- put a brief description of license in LICENSE file
- put full license versions in LICENSE-GPLv3 and LICENSE-Apache2.0
- simplify the per-file header to reference LICENSE
- tox: ignore H102 (Apache License Header check)
Add license header to files that ship.
Reformat headers, make sure everything has vi: at end of file.
Non-shipping files do not need the copyright header,
but at the moment tests/ have it.
Diffstat (limited to 'cloudinit/net/cmdline.py')
| -rwxr-xr-x | cloudinit/net/cmdline.py | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/cloudinit/net/cmdline.py b/cloudinit/net/cmdline.py index a8bf73fb..7c5d11a7 100755 --- a/cloudinit/net/cmdline.py +++ b/cloudinit/net/cmdline.py @@ -1,20 +1,9 @@ -# Copyright (C) 2013-2014 Canonical Ltd. +# Copyright (C) 2013-2014 Canonical Ltd. # -# Author: Scott Moser <scott.moser@canonical.com> -# Author: Blake Rouse <blake.rouse@canonical.com> +# Author: Scott Moser <scott.moser@canonical.com> +# Author: Blake Rouse <blake.rouse@canonical.com> # -# Curtin is free software: you can redistribute it and/or modify it under -# the terms of the GNU Affero General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# Curtin is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for -# more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Curtin. If not, see <http://www.gnu.org/licenses/>. +# This file is part of cloud-init. See LICENSE file for license information. import base64 import glob @@ -217,3 +206,5 @@ def read_kernel_cmdline_config(files=None, mac_addrs=None, cmdline=None): mac_addrs[k] = mac_addr return config_from_klibc_net_cfg(files=files, mac_addrs=mac_addrs) + +# vi: ts=4 expandtab |