summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJon Grimm <jon.grimm@canonical.com>2016-11-22 17:09:53 -0600
committerScott Moser <smoser@brickies.net>2016-12-22 17:04:28 -0500
commitb2a9f33616c806ae6e052520a8589113308f567c (patch)
treee24d64e56104dfa1b608a9f255c9b8f618e45cc0 /tools
parent0b0f254a6935a1b1fff128fa177152dd519e1a3d (diff)
downloadvyos-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 'tools')
-rwxr-xr-xtools/Z99-cloud-locale-test.sh6
-rwxr-xr-xtools/cloud-init-per1
-rwxr-xr-xtools/hacking.py4
-rwxr-xr-xtools/hook-dhclient3
-rwxr-xr-xtools/hook-network-manager2
-rwxr-xr-xtools/hook-rhel.sh2
-rwxr-xr-xtools/make-mime.py2
-rwxr-xr-xtools/mock-meta.py2
-rwxr-xr-xtools/motd-hook20
-rwxr-xr-xtools/read-dependencies2
-rwxr-xr-xtools/read-version2
-rwxr-xr-xtools/uncloud-init3
-rwxr-xr-xtools/validate-yaml.py2
-rwxr-xr-xtools/write-ssh-key-fingerprints1
14 files changed, 31 insertions, 21 deletions
diff --git a/tools/Z99-cloud-locale-test.sh b/tools/Z99-cloud-locale-test.sh
index 8e0469ed..5912bae2 100755
--- a/tools/Z99-cloud-locale-test.sh
+++ b/tools/Z99-cloud-locale-test.sh
@@ -1,13 +1,14 @@
#!/bin/sh
-# vi: ts=4 noexpandtab
+# Copyright (C) 2012, Canonical Group, Ltd.
#
# Author: Ben Howard <ben.howard@canonical.com>
# Author: Scott Moser <scott.moser@ubuntu.com>
# (c) 2012, Canonical Group, Ltd.
#
+# This file is part of cloud-init. See LICENSE file for license information.
+
# Purpose: Detect invalid locale settings and inform the user
# of how to fix them.
-#
locale_warn() {
local bad_names="" bad_lcs="" key="" val="" var="" vars="" bad_kv=""
@@ -96,3 +97,4 @@ locale_warn() {
locale 2>&1 | locale_warn
unset locale_warn
+# vi: ts=4 noexpandtab
diff --git a/tools/cloud-init-per b/tools/cloud-init-per
index 5d9a2864..7d6754b6 100755
--- a/tools/cloud-init-per
+++ b/tools/cloud-init-per
@@ -1,4 +1,5 @@
#!/bin/sh
+# This file is part of cloud-init. See LICENSE file for license information.
DATA_PRE="/var/lib/cloud/sem/bootper"
INST_PRE="/var/lib/cloud/instance/sem/bootper"
diff --git a/tools/hacking.py b/tools/hacking.py
index 2d366a0a..6c320935 100755
--- a/tools/hacking.py
+++ b/tools/hacking.py
@@ -1,6 +1,4 @@
#!/usr/bin/env python
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
# Copyright (c) 2012, Cloudscaling
# All Rights Reserved.
#
@@ -169,3 +167,5 @@ if __name__ == "__main__":
if len(_missingImport) > 0:
print >> sys.stderr, ("%i imports missing in this test environment"
% len(_missingImport))
+
+# vi: ts=4 expandtab
diff --git a/tools/hook-dhclient b/tools/hook-dhclient
index 6a4626c6..02122f37 100755
--- a/tools/hook-dhclient
+++ b/tools/hook-dhclient
@@ -1,6 +1,9 @@
#!/bin/sh
+# This file is part of cloud-init. See LICENSE file for license information.
+
# This script writes DHCP lease information into the cloud-init run directory
# It is sourced, not executed. For more information see dhclient-script(8).
+
is_azure() {
local dmi_path="/sys/class/dmi/id/board_vendor" vendor=""
if [ -e "$dmi_path" ] && read vendor < "$dmi_path"; then
diff --git a/tools/hook-network-manager b/tools/hook-network-manager
index 98a36c8a..67d9044a 100755
--- a/tools/hook-network-manager
+++ b/tools/hook-network-manager
@@ -1,4 +1,6 @@
#!/bin/sh
+# This file is part of cloud-init. See LICENSE file for license information.
+
# This script hooks into NetworkManager(8) via its scripts
# arguments are 'interface-name' and 'action'
#
diff --git a/tools/hook-rhel.sh b/tools/hook-rhel.sh
index 8232414c..513a5515 100755
--- a/tools/hook-rhel.sh
+++ b/tools/hook-rhel.sh
@@ -1,4 +1,6 @@
#!/bin/sh
+# This file is part of cloud-init. See LICENSE file for license information.
+
# Current versions of RHEL and CentOS do not honor the directory
# /etc/dhcp/dhclient-exit-hooks.d so this file can be placed in
# /etc/dhcp/dhclient.d instead
diff --git a/tools/make-mime.py b/tools/make-mime.py
index 72b29fb9..12727126 100755
--- a/tools/make-mime.py
+++ b/tools/make-mime.py
@@ -58,3 +58,5 @@ def main():
if __name__ == '__main__':
sys.exit(main())
+
+# vi: ts=4 expandtab
diff --git a/tools/mock-meta.py b/tools/mock-meta.py
index 1c746f17..d74f9e31 100755
--- a/tools/mock-meta.py
+++ b/tools/mock-meta.py
@@ -452,3 +452,5 @@ def run_server():
if __name__ == '__main__':
run_server()
+
+# vi: ts=4 expandtab
diff --git a/tools/motd-hook b/tools/motd-hook
index 8c482e8c..73d9792c 100755
--- a/tools/motd-hook
+++ b/tools/motd-hook
@@ -1,23 +1,11 @@
#!/bin/sh
+# Copyright (C) 2010 Canonical Ltd.
#
-# 92-ec2-upgrade-available - update-motd script
+# Authors: Scott Moser <smoser@ubuntu.com>
#
-# Copyright (C) 2010 Canonical Ltd.
-#
-# Authors: Scott Moser <smoser@ubuntu.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, version 3 of the License.
-#
-# 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.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# This file is part of cloud-init. See LICENSE file for license information.
+# 92-ec2-upgrade-available - update-motd script
# Determining if updates are available is possibly slow.
# a cronjob runs occasioinally and updates a file with information
diff --git a/tools/read-dependencies b/tools/read-dependencies
index 9fc503eb..f4349055 100755
--- a/tools/read-dependencies
+++ b/tools/read-dependencies
@@ -39,3 +39,5 @@ with open(os.path.join(topd, reqfile), "r") as fp:
print(dep)
sys.exit(0)
+
+# vi: ts=4 expandtab
diff --git a/tools/read-version b/tools/read-version
index c10f9b46..3b30b497 100755
--- a/tools/read-version
+++ b/tools/read-version
@@ -99,3 +99,5 @@ else:
sys.stdout.write(release + "\n")
sys.exit(0)
+
+# vi: ts=4 expandtab
diff --git a/tools/uncloud-init b/tools/uncloud-init
index 2574d482..217371cc 100755
--- a/tools/uncloud-init
+++ b/tools/uncloud-init
@@ -1,5 +1,5 @@
#!/bin/sh
-# vi: ts=4 noexpandtab
+# This file is part of cloud-init. See LICENSE file for license information.
# This script is meant to "kvmify" an image. Its not meant to be
# terribly robust, or a good idea to ever run in a "real image".
@@ -139,3 +139,4 @@ grep -q vga16fb /etc/modprobe.d/blacklist.conf || {
#fi
doexec "$@"
+# vi: ts=4 noexpandtab
diff --git a/tools/validate-yaml.py b/tools/validate-yaml.py
index 2f28d230..d8bbcfcb 100755
--- a/tools/validate-yaml.py
+++ b/tools/validate-yaml.py
@@ -23,3 +23,5 @@ if __name__ == "__main__":
sys.exit(1)
else:
sys.exit(0)
+
+# vi: ts=4 expandtab
diff --git a/tools/write-ssh-key-fingerprints b/tools/write-ssh-key-fingerprints
index 6c3451fd..2a3dca7c 100755
--- a/tools/write-ssh-key-fingerprints
+++ b/tools/write-ssh-key-fingerprints
@@ -1,4 +1,5 @@
#!/bin/sh
+# This file is part of cloud-init. See LICENSE file for license information.
logger_opts="-p user.info -t ec2"