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 /sysvinit | |
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 'sysvinit')
-rwxr-xr-x | sysvinit/redhat/cloud-config | 19 | ||||
-rwxr-xr-x | sysvinit/redhat/cloud-final | 19 | ||||
-rwxr-xr-x | sysvinit/redhat/cloud-init | 19 | ||||
-rwxr-xr-x | sysvinit/redhat/cloud-init-local | 19 |
4 files changed, 12 insertions, 64 deletions
diff --git a/sysvinit/redhat/cloud-config b/sysvinit/redhat/cloud-config index ad8ed831..6da8250c 100755 --- a/sysvinit/redhat/cloud-config +++ b/sysvinit/redhat/cloud-config @@ -1,22 +1,9 @@ #!/bin/sh - -# -# Copyright (C) 2012 Yahoo! Inc. -# -# Author: Joshua Harlow <harlowja@yahoo-inc.com> -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 3, as -# published by the Free Software Foundation. -# -# This program 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 General Public License for more details. +# Copyright (C) 2012 Yahoo! Inc. # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# Author: Joshua Harlow <harlowja@yahoo-inc.com> # +# This file is part of cloud-init. See LICENSE file for license information. # See: http://wiki.debian.org/LSBInitScripts # See: http://tiny.cc/czvbgw diff --git a/sysvinit/redhat/cloud-final b/sysvinit/redhat/cloud-final index aeae8903..8d6f7dfa 100755 --- a/sysvinit/redhat/cloud-final +++ b/sysvinit/redhat/cloud-final @@ -1,22 +1,9 @@ #!/bin/sh - -# -# Copyright (C) 2012 Yahoo! Inc. -# -# Author: Joshua Harlow <harlowja@yahoo-inc.com> -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 3, as -# published by the Free Software Foundation. -# -# This program 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 General Public License for more details. +# Copyright (C) 2012 Yahoo! Inc. # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# Author: Joshua Harlow <harlowja@yahoo-inc.com> # +# This file is part of cloud-init. See LICENSE file for license information. # See: http://wiki.debian.org/LSBInitScripts # See: http://tiny.cc/czvbgw diff --git a/sysvinit/redhat/cloud-init b/sysvinit/redhat/cloud-init index c1c92ad0..f14aca24 100755 --- a/sysvinit/redhat/cloud-init +++ b/sysvinit/redhat/cloud-init @@ -1,22 +1,9 @@ #!/bin/sh - -# -# Copyright (C) 2012 Yahoo! Inc. -# -# Author: Joshua Harlow <harlowja@yahoo-inc.com> -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 3, as -# published by the Free Software Foundation. -# -# This program 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 General Public License for more details. +# Copyright (C) 2012 Yahoo! Inc. # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# Author: Joshua Harlow <harlowja@yahoo-inc.com> # +# This file is part of cloud-init. See LICENSE file for license information. # See: http://wiki.debian.org/LSBInitScripts # See: http://tiny.cc/czvbgw diff --git a/sysvinit/redhat/cloud-init-local b/sysvinit/redhat/cloud-init-local index b9caedbd..5788fcb1 100755 --- a/sysvinit/redhat/cloud-init-local +++ b/sysvinit/redhat/cloud-init-local @@ -1,22 +1,9 @@ #!/bin/sh - -# -# Copyright (C) 2012 Yahoo! Inc. -# -# Author: Joshua Harlow <harlowja@yahoo-inc.com> -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 3, as -# published by the Free Software Foundation. -# -# This program 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 General Public License for more details. +# Copyright (C) 2012 Yahoo! Inc. # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# Author: Joshua Harlow <harlowja@yahoo-inc.com> # +# This file is part of cloud-init. See LICENSE file for license information. # See: http://wiki.debian.org/LSBInitScripts # See: http://tiny.cc/czvbgw |