]> git.proxmox.com Git - mirror_lxc.git/log
mirror_lxc.git
5 years agostorage: prevent unitialized variable warning
Christian Brauner [Sun, 14 Apr 2019 13:46:12 +0000 (15:46 +0200)]
storage: prevent unitialized variable warning

We can simply fix this issue by switching to our cleanup macros instead of
manually freeing the memory.

Closes #2912.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2928 from yosukesan/api_doc_generation_fails_under_out_of_source_...
Christian Brauner [Sat, 6 Apr 2019 13:14:31 +0000 (15:14 +0200)]
Merge pull request #2928 from yosukesan/api_doc_generation_fails_under_out_of_source_build#2927

fix: #2927 api doc generation fails under out of source build.

5 years agoMerge pull request #2926 from tenforward/japanese
Christian Brauner [Sat, 6 Apr 2019 05:21:03 +0000 (07:21 +0200)]
Merge pull request #2926 from tenforward/japanese

doc: update Japanese lxc-user-nic manpage

5 years agofix: #2927 api doc generation fails under out of source build.
yosukesan [Sat, 6 Apr 2019 03:42:41 +0000 (12:42 +0900)]
fix: #2927 api doc generation fails under out of source build.

Signed-off-by: yosukesan <y.otsuki30@gmail.com>
5 years agodoc: update Japanese lxc-user-nic manpage
KATOH Yasufumi [Fri, 5 Apr 2019 17:00:53 +0000 (02:00 +0900)]
doc: update Japanese lxc-user-nic manpage

Update for commit db74bbd

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
5 years agoMerge pull request #2924 from brauner/2019-04-05/lxc_user_nice_update
Stéphane Graber [Fri, 5 Apr 2019 16:32:39 +0000 (12:32 -0400)]
Merge pull request #2924 from brauner/2019-04-05/lxc_user_nice_update

lxc-user-nic: update

5 years agolxc-user-nic: validate request
Christian Brauner [Fri, 5 Apr 2019 12:11:43 +0000 (14:11 +0200)]
lxc-user-nic: validate request

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
5 years agodoc: update lxc-user-nic manpage
Christian Brauner [Fri, 5 Apr 2019 12:01:12 +0000 (14:01 +0200)]
doc: update lxc-user-nic manpage

Closes #1823.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
5 years agolxc-user-nic: small tweaks
Christian Brauner [Fri, 5 Apr 2019 11:30:28 +0000 (13:30 +0200)]
lxc-user-nic: small tweaks

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Cc: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
5 years agoMerge pull request #2923 from flx42/more-pdeathsig-fixes
Christian Brauner [Thu, 4 Apr 2019 14:50:41 +0000 (16:50 +0200)]
Merge pull request #2923 from flx42/more-pdeathsig-fixes

More pdeathsig fixes

5 years agoFix monitor pdeathsig handling
Felix Abecassis [Thu, 4 Apr 2019 04:12:38 +0000 (21:12 -0700)]
Fix monitor pdeathsig handling

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
5 years agoFix user namespace pdeathsig handling
Felix Abecassis [Thu, 4 Apr 2019 04:09:53 +0000 (21:09 -0700)]
Fix user namespace pdeathsig handling

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
5 years agoMerge pull request #2922 from brauner/2019-04-02/ovs_fixes
Stéphane Graber [Wed, 3 Apr 2019 03:08:12 +0000 (23:08 -0400)]
Merge pull request #2922 from brauner/2019-04-02/ovs_fixes

network: fix network device removal

5 years agonetwork: fix network device removal
Christian Brauner [Tue, 2 Apr 2019 21:26:59 +0000 (23:26 +0200)]
network: fix network device removal

Closes #2849.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2920 from tenforward/update_docs
Christian Brauner [Wed, 27 Mar 2019 14:13:46 +0000 (07:13 -0700)]
Merge pull request #2920 from tenforward/update_docs

Update docs

5 years agodoc: Add the description of apparmor profile generation to man pages
KATOH Yasufumi [Wed, 27 Mar 2019 07:56:20 +0000 (16:56 +0900)]
doc: Add the description of apparmor profile generation to man pages

Only add to English and Japanese man pages.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
5 years agodoc: Add lxc.rootfs.managed to lxc.container.conf(5)
KATOH Yasufumi [Wed, 27 Mar 2019 07:52:53 +0000 (16:52 +0900)]
doc: Add lxc.rootfs.managed to lxc.container.conf(5)

Only add to English and Japanese man pages.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
5 years agodoc: Add lxc.cgroup.relative to lxc.container.conf(5)
KATOH Yasufumi [Wed, 27 Mar 2019 06:53:17 +0000 (15:53 +0900)]
doc: Add lxc.cgroup.relative to lxc.container.conf(5)

Only English and Japanese man pages.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
5 years agoMerge pull request #2911 from tomponline/tp-2019-03-19/lvcreate
Christian Brauner [Wed, 27 Mar 2019 01:09:33 +0000 (18:09 -0700)]
Merge pull request #2911 from tomponline/tp-2019-03-19/lvcreate

lvm: Updates lvcreate to wipe signatures if supported

5 years agoMerge pull request #2910 from tomponline/tp-2019-03-19/travis
Christian Brauner [Tue, 26 Mar 2019 11:32:14 +0000 (04:32 -0700)]
Merge pull request #2910 from tomponline/tp-2019-03-19/travis

Travis: Adds -Wall and -Werror cflags flags to automatic build.

5 years agolvm: Updates lvcreate to wipe signatures if supported, fallbacks to old command if...
tomponline [Tue, 19 Mar 2019 18:14:25 +0000 (18:14 +0000)]
lvm: Updates lvcreate to wipe signatures if supported, fallbacks to old command if not.

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agoMerge pull request #2917 from tych0/check-init-pid-failures
Christian Brauner [Mon, 25 Mar 2019 19:55:56 +0000 (12:55 -0700)]
Merge pull request #2917 from tych0/check-init-pid-failures

lxccontainer: check do_lxcapi_init_pid() for failure

5 years agolxccontainer: check do_lxcapi_init_pid() for failure
Tycho Andersen [Mon, 25 Mar 2019 18:08:02 +0000 (12:08 -0600)]
lxccontainer: check do_lxcapi_init_pid() for failure

This function can fail, because it uses the command API. If it does fail,
we get weird errors about not being able to open strange proc paths:

xc authyldapservice-c8020e20-e203-e852-90ef-4d378e8d1444 20190323163231.386 ERROR    lxc_utils - utils.c:switch_to_ns:1184 - No such file or directory - failed to open /proc/-104/ns/net

So let's check for errors before then.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>
5 years agotravis: Attempt to fix src/lxc/cmd/lxc_init.c:251: undefined reference to `pthread_si...
tomponline [Tue, 19 Mar 2019 13:38:55 +0000 (13:38 +0000)]
travis: Attempt to fix src/lxc/cmd/lxc_init.c:251: undefined reference to `pthread_sigmask

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agoattach: Adds ATTR_UNUSED to fd variable assignment to avoid clang unused variable...
tomponline [Tue, 19 Mar 2019 12:28:46 +0000 (12:28 +0000)]
attach: Adds ATTR_UNUSED to fd variable assignment to avoid clang unused variable warnings.

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agoTravis: Adds -Wall and -Werror gcc flags to automatic build.
tomponline [Tue, 19 Mar 2019 11:40:47 +0000 (11:40 +0000)]
Travis: Adds -Wall and -Werror gcc flags to automatic build.

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agoMerge pull request #2907 from brauner/2019-03-12/asan_support
Stéphane Graber [Tue, 12 Mar 2019 23:49:54 +0000 (19:49 -0400)]
Merge pull request #2907 from brauner/2019-03-12/asan_support

hardening: enable address sanitizer build

5 years agohardening: enable address sanitizer build
Christian Brauner [Tue, 12 Mar 2019 19:58:09 +0000 (20:58 +0100)]
hardening: enable address sanitizer build

This adds --{disable,enable}-asan. It is disabled by default.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2903 from flx42/fix-pid-namespace-pdeathsig-handling
Christian Brauner [Tue, 12 Mar 2019 09:38:15 +0000 (10:38 +0100)]
Merge pull request #2903 from flx42/fix-pid-namespace-pdeathsig-handling

Fix PID namespace pdeathsig handling

5 years agostart: fix parent PID passed to lxc_set_death_signal
Felix Abecassis [Tue, 12 Mar 2019 00:15:45 +0000 (17:15 -0700)]
start: fix parent PID passed to lxc_set_death_signal

Fixes: #2902
Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
5 years agoutils: fix handling of PID namespaces in lxc_set_death_signal
Felix Abecassis [Tue, 12 Mar 2019 00:13:48 +0000 (17:13 -0700)]
utils: fix handling of PID namespaces in lxc_set_death_signal

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
5 years agoMerge pull request #2901 from brauner/2019-03-11/compiler_flags
Stéphane Graber [Mon, 11 Mar 2019 23:39:03 +0000 (19:39 -0400)]
Merge pull request #2901 from brauner/2019-03-11/compiler_flags

compiler: hardening

5 years agocompiler: -fexceptions hardening
Christian Brauner [Mon, 11 Mar 2019 22:36:02 +0000 (23:36 +0100)]
compiler: -fexceptions hardening

This hardens multi-threaded C. Without it, the implementation of thread
cancellation handlers (introduced by pthread_cleanup_push) uses a completely
unprotected function pointer on the stack. This function pointer can simplify
the exploitation of stack-based buffer overflows even if the thread in question
is never canceled.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agocompiler: -pipe
Christian Brauner [Mon, 11 Mar 2019 22:34:01 +0000 (23:34 +0100)]
compiler: -pipe

Avoid temporary files, speeding up builds.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agocompiler: -fasynchronous-unwind-tables hardening
Christian Brauner [Mon, 11 Mar 2019 22:30:41 +0000 (23:30 +0100)]
compiler: -fasynchronous-unwind-tables hardening

Increased reliability of backtraces.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2900 from brauner/2019-03-11/2826
Stéphane Graber [Mon, 11 Mar 2019 14:55:02 +0000 (10:55 -0400)]
Merge pull request #2900 from brauner/2019-03-11/2826

btrfs: ensure \0 byte at end

5 years agobtrfs: ensure \0 byte at end
Christian Brauner [Mon, 11 Mar 2019 11:47:23 +0000 (12:47 +0100)]
btrfs: ensure \0 byte at end

Apparently the name received from the tree walk is not guaranteed to have \0
byte at the end. So let's make sure we append one.
Note that this is only an issue if there are any subvolumes in the container's
rootfs.

Closes 2826.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2898 from brauner/2019-03-10/fix_post_stop_hooks
Stéphane Graber [Mon, 11 Mar 2019 00:52:35 +0000 (20:52 -0400)]
Merge pull request #2898 from brauner/2019-03-10/fix_post_stop_hooks

hooks: drop namespace references before post-stop

5 years agohooks: drop namespace references before post-stop
Christian Brauner [Sun, 10 Mar 2019 10:46:18 +0000 (11:46 +0100)]
hooks: drop namespace references before post-stop

Callers such as LXD run post-stop hooks to perform cleanup operations on
shutdown. This can involve umount and other things. To avoid surprises with
lingering namespace references we should close all our namespace-preserving
file descriptors. We don't need them at this point anymore anyway.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2897 from TheSeven/master
Christian Brauner [Wed, 6 Mar 2019 23:26:34 +0000 (00:26 +0100)]
Merge pull request #2897 from TheSeven/master

Fix lxc.cgroup2.<controller> on cgroup2-only systems

5 years agoFix lxc.cgroup2.<controller> on cgroup2-only systems
Michael Sparmann [Wed, 6 Mar 2019 23:06:11 +0000 (00:06 +0100)]
Fix lxc.cgroup2.<controller> on cgroup2-only systems

Signed-off-by: Michael Sparmann <theseven@gmx.net>
5 years agoMerge pull request #2896 from brauner/lxc/master
Stéphane Graber [Tue, 5 Mar 2019 18:42:54 +0000 (13:42 -0500)]
Merge pull request #2896 from brauner/lxc/master

conf: avoid compiler warning

5 years agoconf: avoid compiler warning
Christian Brauner [Tue, 5 Mar 2019 18:29:38 +0000 (19:29 +0100)]
conf: avoid compiler warning

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoRevert "conf: Fixes unitialised variable."
Christian Brauner [Tue, 5 Mar 2019 18:28:52 +0000 (19:28 +0100)]
Revert "conf: Fixes unitialised variable."

This reverts commit 912c4bb474b52284cf82c336b0af161be6c25ac1.

I accidently merged this commit. The initialization is wrong.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2895 from tomponline/tp-2019-03-05/minor-fix
Christian Brauner [Tue, 5 Mar 2019 18:27:32 +0000 (19:27 +0100)]
Merge pull request #2895 from tomponline/tp-2019-03-05/minor-fix

conf: Fixes uninitialised variable.

> @brauner clang is failing but gcc passes, would it be OK to initialise this to 0?

He, unfortunately not. :)
What would happen now is that you'd close `stdin` on a standard system. What you'd want is `= -EBADF`. :)

5 years agoconf: Fixes unitialised variable.
tomponline [Tue, 5 Mar 2019 16:56:42 +0000 (16:56 +0000)]
conf: Fixes unitialised variable.

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agoMerge pull request #2893 from brauner/2019-03-04/minor_tweaks
Stéphane Graber [Tue, 5 Mar 2019 01:45:46 +0000 (02:45 +0100)]
Merge pull request #2893 from brauner/2019-03-04/minor_tweaks

minor tweaks

5 years agoconfile: make parse_limit_value() static
Christian Brauner [Mon, 4 Mar 2019 19:31:52 +0000 (20:31 +0100)]
confile: make parse_limit_value() static

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconfile_utils: make update_hwaddr() static
Christian Brauner [Mon, 4 Mar 2019 19:30:41 +0000 (20:30 +0100)]
confile_utils: make update_hwaddr() static

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconfile_utils: lxc_config_net_is_hwaddr()
Christian Brauner [Mon, 4 Mar 2019 19:26:33 +0000 (20:26 +0100)]
confile_utils: lxc_config_net_is_hwaddr()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2891 from brauner/2019-03-03/update_license_headers
Stéphane Graber [Mon, 4 Mar 2019 18:13:24 +0000 (19:13 +0100)]
Merge pull request #2891 from brauner/2019-03-03/update_license_headers

tree-wide: fix wrong licensing

5 years agoMerge pull request #2884 from brauner/2019-03-01/kill_fgets
Serge Hallyn [Mon, 4 Mar 2019 15:19:07 +0000 (09:19 -0600)]
Merge pull request #2884 from brauner/2019-03-01/kill_fgets

tree-wide: kill fgets()

5 years agoMerge pull request #2889 from tomponline/tp-2019-03-02/bugfixes
Christian Brauner [Mon, 4 Mar 2019 09:36:30 +0000 (10:36 +0100)]
Merge pull request #2889 from tomponline/tp-2019-03-02/bugfixes

gcc -Wall flag compat

5 years agocmd: shut up gcc.
tomponline [Mon, 4 Mar 2019 08:37:16 +0000 (08:37 +0000)]
cmd: shut up gcc.

Closes #2885.

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agostorage: shut up gcc and remove unused variables.
tomponline [Mon, 4 Mar 2019 08:33:51 +0000 (08:33 +0000)]
storage: shut up gcc and remove unused variables.

Closes #2885.

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agostart: shut up gcc.
tomponline [Mon, 4 Mar 2019 08:27:59 +0000 (08:27 +0000)]
start: shut up gcc.

Closes #2885.

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agomonitor: shut up gcc.
tomponline [Mon, 4 Mar 2019 08:25:42 +0000 (08:25 +0000)]
monitor: shut up gcc.

Closes #2885.

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agonetwork: shut up gcc.
tomponline [Mon, 4 Mar 2019 08:23:39 +0000 (08:23 +0000)]
network: shut up gcc.

Closes #2885.

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agolxccontainer: shut up gcc and remove unused variables.
tomponline [Mon, 4 Mar 2019 08:20:59 +0000 (08:20 +0000)]
lxccontainer: shut up gcc and remove unused variables.

Closes #2885.

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agocgroups: shut up gcc
tomponline [Mon, 4 Mar 2019 08:09:57 +0000 (08:09 +0000)]
cgroups: shut up gcc

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agocgroups: remove unused variables
tomponline [Sat, 2 Mar 2019 10:18:18 +0000 (10:18 +0000)]
cgroups: remove unused variables

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agoattacg: shut up gcc
tomponline [Sat, 2 Mar 2019 10:14:32 +0000 (10:14 +0000)]
attacg: shut up gcc

Invalid warning but let's please the compiler.

Closes lxc#2885.

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agoattach: remove unused variable
tomponline [Sat, 2 Mar 2019 10:11:51 +0000 (10:11 +0000)]
attach: remove unused variable

Closes lxc#2885.

Signed-off-by: tomponline <tomp@tomp.uk>
5 years agostring_utils.c: fix wrong licensing
Christian Brauner [Sun, 3 Mar 2019 13:16:31 +0000 (14:16 +0100)]
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>
5 years agofile_utils.c: fix wrong licensing
Christian Brauner [Sun, 3 Mar 2019 13:15:04 +0000 (14:15 +0100)]
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>
5 years agocommands_utils.h: fix wrong licensing
Christian Brauner [Sun, 3 Mar 2019 13:18:41 +0000 (14:18 +0100)]
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>
5 years agocommands_utils.c: fix wrong licensing
Christian Brauner [Sun, 3 Mar 2019 13:11:55 +0000 (14:11 +0100)]
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>
5 years agoMerge pull request #2887 from brauner/2019-03-01/coding_style_updates
Stéphane Graber [Sat, 2 Mar 2019 10:27:19 +0000 (11:27 +0100)]
Merge pull request #2887 from brauner/2019-03-01/coding_style_updates

CODING_STYLE: update

5 years agoMerge pull request #2886 from brauner/2019-03-01/bugfixes
Stéphane Graber [Sat, 2 Mar 2019 10:26:54 +0000 (11:26 +0100)]
Merge pull request #2886 from brauner/2019-03-01/bugfixes

minor fixes

5 years agoMerge pull request #2888 from kubiko/fix-android-compile
Christian Brauner [Fri, 1 Mar 2019 23:41:00 +0000 (00:41 +0100)]
Merge pull request #2888 from kubiko/fix-android-compile

Fix android compilation

5 years agoFix android compilation
Ondrej Kubik [Thu, 21 Feb 2019 14:59:21 +0000 (16:59 +0200)]
Fix android compilation

Signed-off-by: Ondrej Kubik <ondrej.kubik@canonical.com>
5 years agoCODING_STYLE: update
Christian Brauner [Fri, 1 Mar 2019 20:24:31 +0000 (21:24 +0100)]
CODING_STYLE: update

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconfile: shut up gcc
Christian Brauner [Fri, 1 Mar 2019 20:15:49 +0000 (21:15 +0100)]
confile: shut up gcc

Invalid warning but let's please the compiler.

Closes #2885.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: remove unused variable
Christian Brauner [Fri, 1 Mar 2019 20:15:20 +0000 (21:15 +0100)]
conf: remove unused variable

Closes #2885.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoinitutils: remove fgets() from setproctitle()
Christian Brauner [Fri, 1 Mar 2019 20:08:28 +0000 (21:08 +0100)]
initutils: remove fgets() from setproctitle()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoinitutils: remove fgets() from lxc_global_con[...]
Christian Brauner [Fri, 1 Mar 2019 19:55:33 +0000 (20:55 +0100)]
initutils: remove fgets() from lxc_global_con[...]

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoutils: remove fgets() from is_shared_mountpoint()
Christian Brauner [Fri, 1 Mar 2019 11:15:28 +0000 (12:15 +0100)]
utils: remove fgets() from is_shared_mountpoint()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: remove fgets() from lxc_chroot()
Christian Brauner [Fri, 1 Mar 2019 11:12:15 +0000 (12:12 +0100)]
conf: remove fgets() from lxc_chroot()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: remove fgets() from run_buffer()
Christian Brauner [Fri, 1 Mar 2019 11:00:42 +0000 (12:00 +0100)]
conf: remove fgets() from run_buffer()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2882 from misterunknown/master
Stéphane Graber [Thu, 28 Feb 2019 09:34:13 +0000 (10:34 +0100)]
Merge pull request #2882 from misterunknown/master

gpg: use proxy, if http_proxy is set

5 years agogpg: use proxy, if http_proxy is set
Marco Dickert [Thu, 28 Feb 2019 09:03:16 +0000 (10:03 +0100)]
gpg: use proxy, if http_proxy is set

Signed-off-by: Marco Dickert <marco@misterunknown.de>
5 years agoMerge pull request #2881 from Blub/2019-02-25/lxc-attach-move_fd
Christian Brauner [Mon, 25 Feb 2019 16:19:15 +0000 (17:19 +0100)]
Merge pull request #2881 from Blub/2019-02-25/lxc-attach-move_fd

attach: use move_fd in lxc_proc_close_ns_fd

5 years agoattach: use move_fd in lxc_proc_close_ns_fd
Wolfgang Bumiller [Mon, 25 Feb 2019 16:05:24 +0000 (17:05 +0100)]
attach: use move_fd in lxc_proc_close_ns_fd

Previously this set `ctx->ns_fd[*]` to `-EBADF` until commit
fd2a88b190eb ("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>
5 years agoMerge pull request #2880 from brauner/2019-02-22/cleanup_macros
Stéphane Graber [Sat, 23 Feb 2019 22:07:31 +0000 (17:07 -0500)]
Merge pull request #2880 from brauner/2019-02-22/cleanup_macros

tree-wide: cleanup macros

5 years agoconf: cleanup macros suggest_default_idmap
Christian Brauner [Fri, 22 Feb 2019 21:15:09 +0000 (22:15 +0100)]
conf: cleanup macros suggest_default_idmap

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros write_id_mapping
Christian Brauner [Fri, 22 Feb 2019 21:12:20 +0000 (22:12 +0100)]
conf: cleanup macros write_id_mapping

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros setup_mount_entries
Christian Brauner [Fri, 22 Feb 2019 21:07:26 +0000 (22:07 +0100)]
conf: cleanup macros setup_mount_entries

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros make_anonymous_mount_file
Christian Brauner [Fri, 22 Feb 2019 21:06:47 +0000 (22:06 +0100)]
conf: cleanup macros make_anonymous_mount_file

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros lxc_fill_autodev
Christian Brauner [Fri, 22 Feb 2019 21:04:14 +0000 (22:04 +0100)]
conf: cleanup macros lxc_fill_autodev

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros lxc_pivot_root
Christian Brauner [Fri, 22 Feb 2019 20:59:57 +0000 (21:59 +0100)]
conf: cleanup macros lxc_pivot_root

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros lxc_chroot
Christian Brauner [Fri, 22 Feb 2019 20:56:55 +0000 (21:56 +0100)]
conf: cleanup macros lxc_chroot

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: cleanup macros remount_all_slave
Christian Brauner [Fri, 22 Feb 2019 20:49:48 +0000 (21:49 +0100)]
conf: cleanup macros remount_all_slave

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoconf: simplify idmaptool_on_path_and_privileged
Christian Brauner [Fri, 22 Feb 2019 20:41:41 +0000 (21:41 +0100)]
conf: simplify idmaptool_on_path_and_privileged

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoMerge pull request #2867 from brauner/2019-02-19/cleanup_macros
Stéphane Graber [Fri, 22 Feb 2019 20:28:15 +0000 (15:28 -0500)]
Merge pull request #2867 from brauner/2019-02-19/cleanup_macros

tree-wide: cleanup macros

5 years agoMerge pull request #2879 from brauner/2019-02-21/attach_run_wait
Stéphane Graber [Thu, 21 Feb 2019 19:50:51 +0000 (11:50 -0800)]
Merge pull request #2879 from brauner/2019-02-21/attach_run_wait

lxc-attach: switch to attach_run_wait

5 years agolxc-attach: switch to attach_run_wait
Christian Brauner [Thu, 21 Feb 2019 19:28:24 +0000 (20:28 +0100)]
lxc-attach: switch to attach_run_wait

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years ago.travis: remove coverity
Christian Brauner [Thu, 21 Feb 2019 09:56:13 +0000 (10:56 +0100)]
.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>
5 years ago.travis: give coverity one more try
Christian Brauner [Thu, 21 Feb 2019 09:47:13 +0000 (10:47 +0100)]
.travis: give coverity one more try

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoattach: cleanup macros lxc_attach_terminal_[...]
Christian Brauner [Wed, 20 Feb 2019 23:35:52 +0000 (00:35 +0100)]
attach: cleanup macros lxc_attach_terminal_[...]

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
5 years agoattach: cleanup macros lxc_put_attach_clone_[...]
Christian Brauner [Wed, 20 Feb 2019 23:21:57 +0000 (00:21 +0100)]
attach: cleanup macros lxc_put_attach_clone_[...]

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>