proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-15 06:06:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,355 Commits 6 Branches 17 Tags 29 MiB
287df277ff
Commit Graph

6355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Brauner
ba11517564
overlay: simplify and adapt to "overlay" 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-31 23:34:13 +02:00
Christian Brauner
02b5e381d5
lvm: non-functional changes 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-31 23:34:13 +02:00
Christian Brauner
0801b28033
btrfs: simplify + bugfix 
Closes #1698.
Closes #1703.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-31 23:34:13 +02:00
Christian Brauner
90b366fc1f
lxccontainer: use snprintf() 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-31 23:34:13 +02:00
Christian Brauner
5e78e16af0
storage: default to orig type on identical paths 
otherwise default to "dir"

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-31 23:34:11 +02:00
Stéphane Graber
d1f811d5de Merge pull request #1721 from brauner/2017-07-30/fix_saved_config_handling 
network parser fixes
 2017-07-31 15:16:10 -04:00
Christian Brauner
bb461dcca6
test: test for invalid network key 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-31 19:57:57 +02:00
Christian Brauner
dd871fa00a Merge pull request #1720 from hallyn/2017-07-29/cg 
Fix some bugs in #1719
 2017-07-30 16:15:43 -04:00
Christian Brauner
4222a9f44b
lxccontainer: clear whole indexed networks 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-30 21:45:36 +02:00
Christian Brauner
31ee747baa
confile: use deindexed network keys 
When we are passed a network key like "lxc.net.[i].ipv4.address" we need to
make sure that we pass the deindexed key "lxc.net.ipv4.address" to the
{get,clr,set} methods otherwise we'll end up in an endless loop.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-30 21:42:40 +02:00
Serge Hallyn
2c2d6c49dd Fix some bugs in #1719 
In particular, any text (like a #comment) following the mode
would end up in our mode line.

Signed-off-by: Serge Hallyn <serge@hallyn.com>
 2017-07-29 17:38:43 -05:00
Christian Brauner
1135b35b6d Merge pull request #1719 from hallyn/2017-07-28/cg 
Fix up c8bf519d to fit our coding style
 2017-07-29 23:03:55 +02:00
Serge Hallyn
72add15524 Fix up c8bf519d to fit our coding style 
Also reduce the number of mallocs.

Signed-off-by: Serge Hallyn <serge@hallyn.com>
 2017-07-29 14:45:36 -05:00
Serge Hallyn
da7a897ee2 Merge pull request #1708 from aeris/master 
Allow full path in lxc.devices.allow
 2017-07-28 22:31:54 -05:00
Christian Brauner
5fddde036c Merge pull request #1717 from hallyn/harri1 
Use "rsync -SHaAX" to copy the cached rootfs into place
 2017-07-28 22:10:37 +02:00
Harald Dunkel
6273aef16b Use "rsync -SHaAX" to copy the cached rootfs into place 
(updated by Serge to also handle hte new lxc-fedora{-legacy{.in
templates)

Signed-off-by: Harald Dunkel <harri@afaics.de>
Signed-off-by: Serge Hallyn <serge@hallyn.com>
Acked-by: Serge Hallyn <serge@hallyn.com>
 2017-07-28 13:09:36 -05:00
Stéphane Graber
f1401c06ae Merge pull request #1716 from brauner/2017-07-28/bugfix 
lvm: fix check
 2017-07-28 15:59:28 +02:00
Christian Brauner
505dd98779
lvm: fix check 
Signed-off-by: Thomas Hipp <thipp@suse.de>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-28 15:33:50 +02:00
Stéphane Graber
41609c461b Merge pull request #1715 from brauner/2017-07-27/fix_gcc7_bug 
lvm: check whether lxc.bdev.lvm.vg is empty
 2017-07-28 07:13:04 +02:00
Christian Brauner
bb30b52a76
cgroups: use tight scoping 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-28 06:17:28 +02:00
Christian Brauner
01e5fa0792
lvm: check whether lxc.bdev.lvm.vg is set 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-28 06:17:01 +02:00
Stéphane Graber
bef81ce588 Merge pull request #1714 from brauner/2017-07-27/fix_gcc7_bug 
cgroups: workaround gcc-7 bug
 2017-07-27 21:33:19 +02:00
Christian Brauner
66b66624fc
cgroups: workaround gcc-7 bug 
Also: LOL

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-27 21:04:59 +02:00
Serge Hallyn
d9f78406d0 Merge pull request #1713 from brauner/2017-07-26/hybrid_cgroup_support 
cgroups: handle hybrid cgroup layouts
 2017-07-26 18:12:46 -05:00
Christian Brauner
6328fd9c05
cgroups: handle hybrid cgroup layouts 
Closes #1669.
Closes #1678.
Relates to https://github.com/systemd/systemd/issues/6408.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-26 15:20:01 +02:00
Christian Brauner
04ad7ffe2a
utils: move helpers from cgfsng.c to utils.{c,h} 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-26 14:57:35 +02:00
aeris
c8bf519d7e Allow full path in lxc.devices.allow 
Some devices like LVM or cryptsetup entries have no stable major/minor, changing between host reboots.
In this case, hardcoded numbers are not usable in config file and there is currently no way to use hook with lxc-device to do the link at guest startup :

    * `pre-start`/`autodev` hook runs in host context but has the guest in stopped state and so lxc-device not usable
    * `start` hook is in running state but runs in guest context and so lxc-device not available

This patch converts fullpath in lxc.devices.allow to current major/minor numbers to address those changing numbers.

Signed-off-by: aeris <aeris@imirhil.fr>
 2017-07-26 12:17:33 +02:00
Serge Hallyn
c1cecfdd05 Merge pull request #1606 from brauner/2017-06-01/lxc_setup_after_cgroup_unshare 
call lxc_setup() after unshare(CLONE_NEWCGROUP)
 2017-07-25 10:18:10 -05:00
Christian Brauner
f4152036dd
start: lxc_setup() after unshare(CLONE_NEWCGROUP) 
When the running kernel supports cgroup namespaces and users want to manually
set up cgroups via lxc.hook.mount before the init binary starts the cgroup
namespace needs to be already unshared. Otherwise the view on the cgroup mounts
is wrong. This commit places the call to lxc_setup() after the
LXC_SYNC_POST_CGROUP barrier.

Before this commit, the tty fds we allocate from a fresh devpts instance in the
container's namespaces before the init binary starts were referring to the
host's cgroup namespace since lxc_setup() was called before
unshare(CLONE_NEWCGROUP). Although not a security risk at this point since
setns() restricts its calls to /proc/<self>/ns files it's still better to do it
*after* the cgroup namespace has been unshared.

Adding a Suggested-by line for the lxc.mount.hook fix for Quentin.

Closes #1597.

Suggested-by: Quentin Dufour <quentin@dufour.tk>
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
 2017-07-24 14:21:23 +02:00
Christian Brauner
fa1bafd3f0 Merge pull request #1706 from lifeng68/do_remount 
Fix issue #1702, do remount with the MS_REMOUNT flag when mounts with MS_RDONLY
 2017-07-24 02:47:33 +02:00
Li Feng
5ae72b98f8 Using 'add-required_remount_flags' function to add required flags 
Signed-off-by: Li Feng <lifeng68@huawei.com>
 2017-07-24 16:26:52 +08:00
Li Feng
5ee0b2693e Add test script to test the ro option of lxc.rootfs.options 
Signed-off-by: Li Feng <lifeng68@huawei.com>
 2017-07-18 18:31:35 +08:00
Li Feng
0a693043fb Fix issue #1702, do remount with the MS_REMOUNT flag when mounts with MS_RDONLY 
Signed-off-by: Li Feng <lifeng68@huawei.com>
 2017-07-17 17:09:16 +08:00
Christian Brauner
82ce69b151 Merge pull request #1696 from 0x0916/2017-07-12/remove-old-workaround-case 
cgfsng: remove the old workdaround code
 2017-07-12 10:47:53 +02:00
Christian Brauner
cdb4bcc26b Merge pull request #1695 from 0x0916/2017-07-12/update-doc-and-test 
update doc and test
 2017-07-12 10:45:51 +02:00
Long Wang
a7896f5836 cgfsng: remove the old workdaround code 
Signed-off-by: Long Wang <w@laoqinren.net>
 2017-07-12 15:34:36 +08:00
Long Wang
f30ab9fe2a tests: fix typo 
Signed-off-by: Long Wang <w@laoqinren.net>
 2017-07-12 11:08:01 +08:00
Long Wang
08d9d0e5bd doc: s/lxc.net.ipv6/lxc.net.ipv6.address/g 
Signed-off-by: Long Wang <w@laoqinren.net>
 2017-07-12 10:56:20 +08:00
Long Wang
2c67dc7987 doc: s/lxc.net.ipv4/lxc.net.ipv4.address/g 
Signed-off-by: Long Wang <w@laoqinren.net>
 2017-07-12 10:54:28 +08:00
Long Wang
48d5fccf10 doc: s/lxc.mount/lxc.mount.fstab/g 
Signed-off-by: Long Wang <w@laoqinren.net>
 2017-07-12 10:51:16 +08:00
Long Wang
e4075f8385 doc: s/lxc.pts/lxc.pty.max/g 
Signed-off-by: Long Wang <w@laoqinren.net>
 2017-07-12 10:47:34 +08:00
Long Wang
0873f85ce7 doc: s/lxc.tty/lxc.tty.max/g 
Signed-off-by: Long Wang <w@laoqinren.net>
 2017-07-12 10:45:17 +08:00
Long Wang
5042d96d12 doc: s/lxc.console/lxc.console.path/g 
Signed-off-by: Long Wang <w@laoqinren.net>
 2017-07-12 10:35:51 +08:00
Long Wang
a64f3157a1 doc: s/lxc.rootfs/lxc.rootfs.path/g 
Signed-off-by: Long Wang <w@laoqinren.net>
 2017-07-12 10:23:22 +08:00
Long Wang
501cf9b019 doc: s/seccomp/seccomp.profile/g 
Signed-off-by: Long Wang <w@laoqinren.net>
 2017-07-12 10:04:58 +08:00
Long Wang
b84702ab43 doc: s/se_context/selinux.context/g 
Signed-off-by: Long Wang <w@laoqinren.net>
 2017-07-12 09:58:35 +08:00
Long Wang
a1d5fdfd9b doc: s/aa_profile/apparmor.profile/g 
Signed-off-by: Long Wang <w@laoqinren.net>
 2017-07-12 09:53:58 +08:00
Long Wang
69e38e009b doc: s/aa_allow_incomplete/apparmor.allow_incomplete/g 
Signed-off-by: Long Wang <w@laoqinren.net>
 2017-07-12 09:46:20 +08:00
Christian Brauner
93e2c33651 Merge pull request #1692 from 0x0916/2017-07-11/cgfsng 
cgfsng: only output debug info when we set cgroup data
 2017-07-11 11:48:20 +02:00
Christian Brauner
05ad2eb3f1 Merge pull request #1693 from tenforward/japanese 
Update Japanese man pages
 2017-07-11 11:09:15 +02:00