Commit Graph

8360 Commits

Author SHA1 Message Date
tomponline
7c737378f9 attacg: shut up gcc
Invalid warning but let's please the compiler.

Closes lxc#2885.

Signed-off-by: tomponline <tomp@tomp.uk>
2019-03-04 07:59:33 +00:00
tomponline
aa26c8e2b5 attach: remove unused variable
Closes lxc#2885.

Signed-off-by: tomponline <tomp@tomp.uk>
2019-03-04 07:59:33 +00:00
Christian Brauner
601b35e7ac
string_utils.c: fix wrong licensing
liblxc has always been meant to be LGPLv2.1+ as reflected by the many
downstreams projects and bindings which are themselves under LGPLv2.1+ or other
licenses which would be incompatible with linking against a GPLv2+ library.

It's pretty normal for a library to be LGPL while binaries are GPL as a GPL
library would only ever be usable by other GPL-only projects, which isn't the
case for very many of the liblxc downstreams.

The issue here is really carelessness. None of those GPL headers were put there
intentionally, instead being wrongly copy/pasted from other parts of the
codebase which is indeed intended to be GPLv2+. This is also made clear in our
CONTRIBUTING file in this repository:

Licensing for new files:
------------------------

LXC is made of files shipped under a few different licenses.

Anything that ends up being part of the LXC library needs to be released
under LGPLv2.1+ or a license compatible with it (though the latter will
only be accepted for cases where the code originated elsewhere and was
imported into LXC).

Language bindings for the libraries need to be released under LGPLv2.1+.

Anything else (non-libraries) needs to be Free Software and needs to be
allowed to link with LGPLv2.1+ code (if needed). LXC upstream prefers
LGPLv2.1+ or GPLv2 for those.

When introducing a new file into the project, please make sure it has a
copyright header making clear under which license it's being released
and if it doesn't match the criteria described above, please explain
your decision on the lxc-devel mailing-list when submitting your patch.

This is intended to switch over files to LGPLv2.1+ to which end we have
collected ACKs from relevant people.
/* Affected People */
Christian Brauner <christian.brauner@ubuntu.com>
Donghwa Jeong <dh48.jeong@samsung.com>

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Acked-by: Donghwa Jeong <dh48.jeong@samsung.com>
2019-03-03 14:19:23 +01:00
Christian Brauner
8d01f531c2
file_utils.c: fix wrong licensing
liblxc has always been meant to be LGPLv2.1+ as reflected by the many
downstreams projects and bindings which are themselves under LGPLv2.1+ or other
licenses which would be incompatible with linking against a GPLv2+ library.

It's pretty normal for a library to be LGPL while binaries are GPL as a GPL
library would only ever be usable by other GPL-only projects, which isn't the
case for very many of the liblxc downstreams.

The issue here is really carelessness. None of those GPL headers were put there
intentionally, instead being wrongly copy/pasted from other parts of the
codebase which is indeed intended to be GPLv2+. This is also made clear in our
CONTRIBUTING file in this repository:

Licensing for new files:
------------------------

LXC is made of files shipped under a few different licenses.

Anything that ends up being part of the LXC library needs to be released
under LGPLv2.1+ or a license compatible with it (though the latter will
only be accepted for cases where the code originated elsewhere and was
imported into LXC).

Language bindings for the libraries need to be released under LGPLv2.1+.

Anything else (non-libraries) needs to be Free Software and needs to be
allowed to link with LGPLv2.1+ code (if needed). LXC upstream prefers
LGPLv2.1+ or GPLv2 for those.

When introducing a new file into the project, please make sure it has a
copyright header making clear under which license it's being released
and if it doesn't match the criteria described above, please explain
your decision on the lxc-devel mailing-list when submitting your patch.

This is intended to switch over files to LGPLv2.1+ to which end we have
collected ACKs from relevant people.
/* Affected People */
Christian Brauner <christian.brauner@ubuntu.com>
Donghwa Jeong <dh48.jeong@samsung.com>

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Acked-by: Donghwa Jeong <dh48.jeong@samsung.com>
2019-03-03 14:19:23 +01:00
Christian Brauner
0fb44ac949
commands_utils.h: fix wrong licensing
liblxc has always been meant to be LGPLv2.1+ as reflected by the many
downstreams projects and bindings which are themselves under LGPLv2.1+ or other
licenses which would be incompatible with linking against a GPLv2+ library.

It's pretty normal for a library to be LGPL while binaries are GPL as a GPL
library would only ever be usable by other GPL-only projects, which isn't the
case for very many of the liblxc downstreams.

The issue here is really carelessness. None of those GPL headers were put there
intentionally, instead being wrongly copy/pasted from other parts of the
codebase which is indeed intended to be GPLv2+. This is also made clear in our
CONTRIBUTING file in this repository:

Licensing for new files:
------------------------

LXC is made of files shipped under a few different licenses.

Anything that ends up being part of the LXC library needs to be released
under LGPLv2.1+ or a license compatible with it (though the latter will
only be accepted for cases where the code originated elsewhere and was
imported into LXC).

Language bindings for the libraries need to be released under LGPLv2.1+.

Anything else (non-libraries) needs to be Free Software and needs to be
allowed to link with LGPLv2.1+ code (if needed). LXC upstream prefers
LGPLv2.1+ or GPLv2 for those.

When introducing a new file into the project, please make sure it has a
copyright header making clear under which license it's being released
and if it doesn't match the criteria described above, please explain
your decision on the lxc-devel mailing-list when submitting your patch.

This is intended to switch over files to LGPLv2.1+ to which end we have
collected ACKs from relevant people.
/* Affected People */
Christian Brauner <christian.brauner@ubuntu.com>
Donghwa Jeong <dh48.jeong@samsung.com>

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Acked-by: Donghwa Jeong <dh48.jeong@samsung.com>
2019-03-03 14:19:23 +01:00
Christian Brauner
ddaa52263a
commands_utils.c: fix wrong licensing
liblxc has always been meant to be LGPLv2.1+ as reflected by the many
downstreams projects and bindings which are themselves under LGPLv2.1+ or other
licenses which would be incompatible with linking against a GPLv2+ library.

It's pretty normal for a library to be LGPL while binaries are GPL as a GPL
library would only ever be usable by other GPL-only projects, which isn't the
case for very many of the liblxc downstreams.

The issue here is really carelessness. None of those GPL headers were put there
intentionally, instead being wrongly copy/pasted from other parts of the
codebase which is indeed intended to be GPLv2+. This is also made clear in our
CONTRIBUTING file in this repository:

Licensing for new files:
------------------------

LXC is made of files shipped under a few different licenses.

Anything that ends up being part of the LXC library needs to be released
under LGPLv2.1+ or a license compatible with it (though the latter will
only be accepted for cases where the code originated elsewhere and was
imported into LXC).

Language bindings for the libraries need to be released under LGPLv2.1+.

Anything else (non-libraries) needs to be Free Software and needs to be
allowed to link with LGPLv2.1+ code (if needed). LXC upstream prefers
LGPLv2.1+ or GPLv2 for those.

When introducing a new file into the project, please make sure it has a
copyright header making clear under which license it's being released
and if it doesn't match the criteria described above, please explain
your decision on the lxc-devel mailing-list when submitting your patch.

This is intended to switch over files to LGPLv2.1+ to which end we have
collected ACKs from relevant people.
/* Affected People */
Christian Brauner <christian.brauner@ubuntu.com>
Donghwa Jeong <dh48.jeong@samsung.com>

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Acked-by: Donghwa Jeong <dh48.jeong@samsung.com>
2019-03-03 14:17:15 +01:00
Stéphane Graber
9fc7a50f8a
Merge pull request #2887 from brauner/2019-03-01/coding_style_updates
CODING_STYLE: update
2019-03-02 11:27:19 +01:00
Stéphane Graber
e096ae3c40
Merge pull request #2886 from brauner/2019-03-01/bugfixes
minor fixes
2019-03-02 11:26:54 +01:00
Christian Brauner
40f125b48d
Merge pull request #2888 from kubiko/fix-android-compile
Fix android compilation
2019-03-02 00:41:00 +01:00
Ondrej Kubik
dbcbf27055 Fix android compilation
Signed-off-by: Ondrej Kubik <ondrej.kubik@canonical.com>
2019-03-01 23:19:29 +00:00
Christian Brauner
af32408ac1
CODING_STYLE: update
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-03-01 21:27:39 +01:00
Christian Brauner
0cacddda88
confile: shut up gcc
Invalid warning but let's please the compiler.

Closes #2885.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-03-01 21:15:49 +01:00
Christian Brauner
c1b07e059f
conf: remove unused variable
Closes #2885.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-03-01 21:15:20 +01:00
Christian Brauner
f1170ed236
initutils: remove fgets() from setproctitle()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-03-01 21:08:28 +01:00
Christian Brauner
55d830d816
initutils: remove fgets() from lxc_global_con[...]
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-03-01 20:58:49 +01:00
Christian Brauner
c4382ee266
utils: remove fgets() from is_shared_mountpoint()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-03-01 20:58:49 +01:00
Christian Brauner
f3d38164ea
conf: remove fgets() from lxc_chroot()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-03-01 20:58:49 +01:00
Christian Brauner
ebf3a6af23
conf: remove fgets() from run_buffer()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-03-01 12:17:46 +01:00
Stéphane Graber
e613d684fa
Merge pull request #2882 from misterunknown/master
gpg: use proxy, if http_proxy is set
2019-02-28 10:34:13 +01:00
Marco Dickert
4144080156 gpg: use proxy, if http_proxy is set
Signed-off-by: Marco Dickert <marco@misterunknown.de>
2019-02-28 10:03:16 +01:00
Christian Brauner
1fe8dffad6
Merge pull request #2881 from Blub/2019-02-25/lxc-attach-move_fd
attach: use move_fd in lxc_proc_close_ns_fd
2019-02-25 17:19:15 +01:00
Wolfgang Bumiller
5f9facdac9 attach: use move_fd in lxc_proc_close_ns_fd
Previously this set `ctx->ns_fd[*]` to `-EBADF` until commit
fd2a88b190 ("attach: cleanup macros lxc_proc_close_ns_fd",
but there are some code paths where we call this before
later calling `lxc_proc_put_context_info` which would call
this function again with the file descriptors still
unchanged.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
2019-02-25 17:05:24 +01:00
Stéphane Graber
de24eb5ba6
Merge pull request #2880 from brauner/2019-02-22/cleanup_macros
tree-wide: cleanup macros
2019-02-23 17:07:31 -05:00
Christian Brauner
4aae564fda
conf: cleanup macros suggest_default_idmap
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-22 22:15:09 +01:00
Christian Brauner
76bcd4224a
conf: cleanup macros write_id_mapping
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-22 22:12:20 +01:00
Christian Brauner
c85ced6517
conf: cleanup macros setup_mount_entries
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-22 22:07:26 +01:00
Christian Brauner
79bcf5ee05
conf: cleanup macros make_anonymous_mount_file
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-22 22:06:47 +01:00
Christian Brauner
ae2a3d81b6
conf: cleanup macros lxc_fill_autodev
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-22 22:04:14 +01:00
Christian Brauner
b0d7aac4e6
conf: cleanup macros lxc_pivot_root
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-22 21:59:57 +01:00
Christian Brauner
4fdd1f7251
conf: cleanup macros lxc_chroot
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-22 21:56:55 +01:00
Christian Brauner
003be47b90
conf: cleanup macros remount_all_slave
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-22 21:49:48 +01:00
Christian Brauner
3275932b42
conf: simplify idmaptool_on_path_and_privileged
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-22 21:41:41 +01:00
Stéphane Graber
c4fb13e9f1
Merge pull request #2867 from brauner/2019-02-19/cleanup_macros
tree-wide: cleanup macros
2019-02-22 15:28:15 -05:00
Stéphane Graber
8d36ef3b47
Merge pull request #2879 from brauner/2019-02-21/attach_run_wait
lxc-attach: switch to attach_run_wait
2019-02-21 11:50:51 -08:00
Christian Brauner
8cddb10fe1
lxc-attach: switch to attach_run_wait
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-21 20:28:24 +01:00
Christian Brauner
b557844a0c
.travis: remove coverity
It hasn't worked reliably for us for a long time. Remove it until such time as
someone cares enough to fix it.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-21 10:56:13 +01:00
Christian Brauner
41fd48f94a
.travis: give coverity one more try
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-21 10:47:13 +01:00
Christian Brauner
19a3e90644
attach: cleanup macros lxc_attach_terminal_[...]
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-21 00:35:52 +01:00
Christian Brauner
92db57092b
attach: cleanup macros lxc_put_attach_clone_[...]
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-21 00:21:57 +01:00
Christian Brauner
3cc629fe9f
attach: cleanup macros in_same_namespace
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-21 00:19:21 +01:00
Christian Brauner
fd2a88b190
attach: cleanup macros lxc_proc_close_ns_fd
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-21 00:19:21 +01:00
Stéphane Graber
274ec1e128
Merge pull request #2876 from brauner/2019-02-20/run_coccinelle_during_tests
travis: run coccinelle
2019-02-20 12:33:58 -08:00
Christian Brauner
d0232ab28d
travis: run coccinelle
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-20 21:19:39 +01:00
Stéphane Graber
d58e39ee57
Merge pull request #2875 from brauner/2019-02-20/run_coccinelle_during_tests
tests: run coccinelle checks
2019-02-20 12:04:08 -08:00
Christian Brauner
00cbf8f4eb
travis: run coccinelle
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-20 20:44:16 +01:00
Christian Brauner
ec769e5bad
Merge pull request #2874 from stgraber/master
Fix existing mount target check
2019-02-20 20:06:08 +01:00
Stéphane Graber
d8bc14a762
Fix existing mount target check
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2019-02-20 10:55:09 -08:00
Christian Brauner
3a6e3bf598
conf: cleanup macros suggest_default_idmap
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-19 23:50:25 +01:00
Christian Brauner
4f410b2ae8
conf: cleanup macros get{g,u}name
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-19 23:50:25 +01:00
Christian Brauner
00d6cfe25a
conf: cleanup macros get_minimal_idmap
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2019-02-19 23:50:25 +01:00