proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-16 07:02:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,173 Commits 6 Branches 17 Tags 29 MiB
c74da4abd2
Commit Graph

8173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Brauner
86439b238b
Merge pull request #2789 from lifeng68/fix_memory_leak 
Fix memory leak in cgroup_exit
 2019-01-17 11:49:41 +02:00
LiFeng
96a03c1f37 Fix memory leak in cgroup_exit 
Add free memory pointed by struct cgroup_ops *ops

Signed-off-by: LiFeng <lifeng68@huawei.com>
 2019-01-17 05:49:06 -05:00
t00416110
a3ed9b8118 conf.c: fix memory leak and mount error 
1. cleanup namespace memory
2. fix bug when ro mount not setted, mount propagation will be skipped.

Signed-off-by: t00416110 <tanyifeng1@huawei.com>
 2019-01-17 17:33:34 +08:00
Wolfgang Bumiller
d1c203f480 Revert "conf: remove extra MS_BIND with sysfs:mixed" 
This reverts commit 51a922baf7.

The above commit confuses the mountall unit of privileged
Ubuntu 14.04 containers at startup so that they cannot
finish booting.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
 2019-01-17 09:20:29 +01:00
Christian Brauner
20b4a59291
Merge pull request #2785 from lifeng68/fix_return 
start: __lxc_start return -1 when start fails
 2019-01-16 11:12:48 +02:00
LiFeng
575ea46728 start: __lxc_start return -1 when start fails 
Signed-off-by: LiFeng <lifeng68@huawei.com>
 2019-01-15 07:25:00 -05:00
Wolfgang Bumiller
bd72001f1a
Merge pull request #2781 from brauner/hn-veth-uid 
network: prefix veth interface name with uid info
 2019-01-11 10:31:25 +01:00
hn
aa2fdfd362
network: prefix veth interface name with uid info 
Signed-off-by: Hajo Noerenberg <hajo-github@noerenberg.de>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-01-10 23:22:52 +01:00
Stéphane Graber
421a68d65c
Merge pull request #2780 from brauner/2019-01-10/cgroupns_skip_on_einval 
start: handle missing CLONE_NEWCGROUP
 2019-01-10 11:09:27 -05:00
Christian Brauner
bca7c59cad
start: handle missing CLONE_NEWCGROUP 
If cgroup namespaces are not supported we should just record it in the
log and move on.

Cc: Ondrej Kubik <ondrej.kubik@canonical.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-01-10 13:55:55 +01:00
Wolfgang Bumiller
888aad3750
Merge pull request #2777 from brauner/2019-01-09/cgfsng_with_no_controllers 
cgroups: try to handle layouts with no cgroups
 2019-01-10 13:39:23 +01:00
Christian Brauner
69b4a4bbfd
cgroups: try to handle layouts with no cgroups 
Cc: Ondrej Kubik <ondrej.kubik@canonical.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-01-08 23:56:50 +01:00
Christian Brauner
2fa5dff988
Merge pull request #2775 from kubiko/android-fix-compile 
Fixing compile error when compiling for android
 2019-01-08 18:14:20 +01:00
Ondrej Kubik
60018868a3 Fixing compile error when compiling for android 
Signed-off-by: Ondrej Kubik <ondrej.kubik@canonical.com>
 2019-01-08 17:00:36 +00:00
Christian Brauner
da7226fbd6
Merge pull request #2774 from hn/master 
trivial fix: unprivileged veth devices (e.g. vethFWABHX) never contain 'Z' char
 2019-01-08 15:57:29 +01:00
hn
8523344a39 fix: unprivileged veth devices (e.g. vethFWABHX) never contain 'Z' character in the randomly generated device name part because for modulo one does not need to substract 1 from strlen(). 
Signed-off-by: Hajo Noerenberg <hajo-github@noerenberg.de>
 2019-01-08 09:04:55 +01:00
Stéphane Graber
b3db9f63bd
Merge pull request #2753 from brauner/2018-12-13/remove_sigwinch_cmd 
terminal: remove sigwinch command
 2019-01-08 00:34:37 +01:00
Stéphane Graber
62aad75f9a
Merge pull request #2755 from brauner/2018-12-16/rootfs_managed 
storage: do not destroy pre-existing rootfs
 2019-01-08 00:34:16 +01:00
Stéphane Graber
9aed875796
Merge pull request #2773 from brauner/2018-01-09/fix_cgroup_deletion 
cgfsng: do not free container_full_path on error
 2019-01-08 00:33:57 +01:00
Stéphane Graber
0c7114c5ce
Merge pull request #2770 from brauner/2018-01-07/container_copy 
lxccontainer: fix container copy
 2019-01-08 00:33:47 +01:00
Stéphane Graber
b5cab13962
Merge pull request #2771 from brauner/2018-01-07/seccomp_nesting_support 
confile: add lxc.seccomp.allow_nesting
 2019-01-08 00:33:04 +01:00
Christian Brauner
85e66fe856
cgfsng: do not free container_full_path on error 
Closes #2741.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-01-07 16:08:26 +01:00
Christian Brauner
50d86993a7
confile: add lxc.seccomp.allow_nesting 
This adds the lxc.seccomp.allow_nesting api extension. If
lxc.seccomp.allow_nesting is set to 1 then seccomp profiles will be
stacked. This way nested containers can load their own seccomp policy on
top of the policy that the outer container might have applied.

Cc: Simon Fels <simon.fels@canonical.com>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-01-07 15:34:08 +01:00
Christian Brauner
3d7e738a6b
lxccontainer: fix container copy 
We need to strip the prefix from the container's source path before
trying to update the file.

Closes #2380.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2019-01-07 13:37:06 +01:00
Christian Brauner
de60a7fe1c
Merge pull request #2768 from caglar10ur/revert-2763-dangling 
Revert "Set c to NULL after freeing it"
 2019-01-06 12:39:17 +01:00
S.Çağlar Onur
4bcf92a32e Revert "Set c to NULL after freeing it" 
Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
 2019-01-05 16:28:54 -08:00
Christian Brauner
5f666a8f7c
Merge pull request #2767 from Blub/2019-01-04/use-syserror-on-write-error 
conf: use SYSERROR on lxc_write_to_file errors
 2019-01-04 12:52:38 +01:00
Wolfgang Bumiller
688e8982bc conf: use SYSERROR on lxc_write_to_file errors 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
 2019-01-04 12:06:31 +01:00
Christian Brauner
dfaaf1cf5a
Merge pull request #2763 from caglar10ur/dangling 
Set c to NULL after freeing it
 2018-12-26 20:53:59 +01:00
S.Çağlar Onur
370c786023 Set c to NULL after freeing it 
Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
 2018-12-26 11:19:13 -08:00
Stéphane Graber
46bccf604b
Merge pull request #2757 from brauner/2018-12-17/mount_injection_file 
lxccontainer: fix mount api (mount_injection_file)
 2018-12-17 10:14:31 -05:00
Christian Brauner
4e5a9657ca
lxccontainer: fix mount api (mount_injection_file) 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-12-17 11:45:58 +01:00
Christian Brauner
92fa4347d7
storage: do not destroy pre-existing rootfs 
Closes #2752.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-12-16 18:40:22 +01:00
Stéphane Graber
8465a7f49e
Re-enable lxc_devel 
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
 2018-12-13 18:20:10 -05:00
Stéphane Graber
4dcd858b92
Release LXC 3.1.0 
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
 2018-12-13 18:12:56 -05:00
Christian Brauner
2bd158cc0c
terminal: remove sigwinch command 
SIGWINCH is handled in lxc_terminal_signalfd_cb().

I cannot for the life of me figure out what this is supposed to do.
Afaict, it scans a global list that is totally unnecessary and also
let's say you have 100 ttys and for a single one SIGWINCH is sent. In
that case the whole list is walked and two ioctl()s are performed: one
to get window size one to set window size. For 99 of them the window
size hasn't changed.
If we see issues we can revert!

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-12-13 15:46:46 +01:00
Christian Brauner
40b2dcbc17
Merge pull request #2751 from xorond/cgroup 
fix #2742: lxc-cgroup not giving output
 2018-12-12 11:49:46 +01:00
Christian Brauner
6a5cc5609c
tools: add newline to lxc-cgroup output 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-12-12 11:47:10 +01:00
Oguz Bektas
b8ac0dd14e fix lxc-cgroup not giving output 
lxc-cgroup fails to provide any output since the latest version, this
should fix it

Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
 2018-12-12 10:26:36 +01:00
Wolfgang Bumiller
b3fc069e41
Merge pull request #2749 from brauner/2018-12-11/storage_utils 
storage: src cannot be truncated
 2018-12-11 14:26:11 +01:00
Christian Brauner
4f08c8d46f
storage: remove unused function 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2018-12-11 13:54:35 +01:00
Christian Brauner
be50a0d9c5
Merge pull request #2747 from ffontaine/master 
configure.ac: fix build without stack-protector
 2018-12-07 19:42:06 +13:00
Fabrice Fontaine
3aa7271157 configure.ac: fix build without stack-protector 
Compiler based hardening (including -fstack-protector-strong) are
enabled since version 3.0.3 and
2268c27754

However, some compilers could missed the needed library (-lssp or
-lssp_nonshared) at linking step so use ax_check_link_flag instead of
ax_check_compile_flag

Fixes:
 - http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 2018-12-04 21:13:47 +01:00
Christian Brauner
c1b70110c8
Merge pull request #2745 from ffontaine/master 
stringutils: include stdarg for va_list
 2018-12-04 14:41:24 +13:00
Fabrice Fontaine
b7df06ad14 stringutils: include stdarg for va_list 
Fixes:
 - http://autobuild.buildroot.org/results/0b90e7dca2984652842832a41abad93ac49a9b86

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 2018-12-03 22:18:16 +01:00
Adam Kasztenny
0e40f65d1d Add template-options to help output 
Copied from the [manpage](9e42c1e3f1/doc/lxc-create.sgml.in (L175)).

Signed-off-by: Adam Kasztenny <adamkasztenny@gmail.com>
 2018-11-30 12:37:24 -05:00
Christian Brauner
9e42c1e3f1
Merge pull request #2743 from 2xsec/build 
fix install error when using --disable-commands option
 2018-11-30 20:53:09 +13:00
Christian Brauner
ec4b01c01e
Merge pull request #2740 from CameronNemo/usernsexec 
lxc-usernsexec: fix default map functionality
 2018-11-30 20:37:28 +13:00
2xsec
9760cfccf2
fix install error when using --disable-commands option 
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
 2018-11-30 15:31:31 +09:00
Cameron Nemo
c14ea11dcc
lxc-usernsexec: fix default map functionality 
* Place NULL bytes at the end of strings so that
  lxc_safe_ulong() can parse them correctly

* Only free the newly created id_map on error,
  to avoid passing garbage to lxc_map_ids()

Signed-off-by: Cameron Nemo <camerontnorman@gmail.com>
 2018-11-28 21:04:34 -08:00