Commit Graph

5727 Commits

Author SHA1 Message Date
Christian Brauner
736da9d08d
rtnl: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-25 07:07:43 +02:00
Christian Brauner
9c538d8a6d
conf: do not check union on wrong net type
This will obviously not work.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-25 06:35:54 +02:00
Christian Brauner
f5c0d3f2cc
conf: refactor network deletion
I'm ashamed at how aweful my previous code was.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-25 06:35:54 +02:00
Christian Brauner
581c75e7f4
openvswitch: delete ports intelligently
So far, when creating veth devices attached to openvswitch bridges we used to
fork() off a thread on container startup. This thread was kept around until the
container shut down. I have no good explanation why we did it that why but it's
certainly not necessary. Instead, let's fork() off the thread on container
shutdown to delete the veth.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-25 06:35:54 +02:00
Christian Brauner
1efc10652c
conf: log lxc-user-nic output
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-25 06:35:54 +02:00
Christian Brauner
a41162aaaa
conf: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-25 06:35:53 +02:00
Christian Brauner
e771c51d9f
lxc-user-nic: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-25 06:35:53 +02:00
Christian Brauner
ebc73a6772
network: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-25 06:35:53 +02:00
Christian Brauner
cb0dc11bac
network: log cleanup thread pid for openswitch
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-25 06:35:53 +02:00
Christian Brauner
dae8c253db
tests: add tests for lxc.cgroup.dir
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-25 06:35:50 +02:00
Christian Brauner
43654d3475 confile: add "lxc.cgroup.dir"
"lxc.cgroup.dir" can be used to set the name of the directory the container's
cgroup will be created in. For example, setting

    lxc.uts.name = c1
    lxc.cgroup.dir = lxd

would make liblxc create the cgroup

    lxd/c1

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-25 06:35:49 +02:00
Serge Hallyn
0298e6bf0f Merge pull request #1758 from carnil/master
Use deb.debian.org as the default Debian mirror
2017-08-24 11:46:34 -05:00
Salvatore Bonaccorso
d312bb74c2 Use deb.debian.org as the default Debian mirror
The httpredir.debian.org service has been discontinued in favour of
deb.debian.org and httpredir.debian.org now redirects to deb.debian.org.

https://lists.debian.org/debian-mirrors/2017/02/msg00000.html
https://wiki.debian.org/DebianGeoMirror#httpredir.debian.org_.2F_http.debian.net

Cf. https://bugs.debian.org/872719

Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
2017-08-24 14:48:03 +02:00
Christian Brauner
104cd54327
cgroups: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-24 12:45:53 +02:00
Christian Brauner
4742cd9a30
conf: non-functional fixup
Surfaced while building lxc-2.0.8 on e2k architecture with lcc,
looks like its -Wall is more pedantic than gcc's:

lcc: "conf.c", line 1514: error: unrecognized character escape sequence
          [-Werror]
        DEBUG("created directory for console and tty devices at \%s\"", path);
                                                                ^
 in expansion of macro "DEBUG" at line 1514

Another byte is a leading whitespace fix while at that.

Signed-off-by: Michael Shigorin <mike@altlinux.org>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-24 12:45:52 +02:00
Christian Brauner
1a0e70ace8
tree-wide: non-functional changes
- replace all "//" with "/* */"

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-24 12:45:47 +02:00
Serge Hallyn
b3c723c446 Merge pull request #1756 from brauner/2017-08-10/further_lxc_2.1_preparations
further lxc 2.1 preparations
2017-08-22 14:42:31 -05:00
Christian Brauner
d6259d368b
tools: add additional cgroup checks
- list all cgroup v1 mountpoints
- list all cgroup v2 mountpoints
- report "missing" when no mountpoint for the systemd controller was found
- report "missing" when no mountpoint for the freezer controller was found

Closes https://github.com/lxc/lxd/issues/3687.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-22 14:24:42 +02:00
Christian Brauner
25a908b818
confile: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-22 12:43:18 +02:00
Christian Brauner
d5aba46091
confile: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-22 12:19:26 +02:00
Christian Brauner
71acf5d0f4
confile: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-22 12:19:26 +02:00
Christian Brauner
861d1adaae
confile: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-22 12:05:55 +02:00
Stéphane Graber
ed07dfa9ee Merge pull request #1755 from brauner/2017-08-10/further_lxc_2.1_preparations
templates: remove legacy key from busybox
2017-08-21 18:36:56 -04:00
Christian Brauner
fd99824155
templates: remove legacy key from busybox
lxc.rebootsignal -> lxc.signal.reboot

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-22 00:02:28 +02:00
Serge Hallyn
7456fb2c44 Merge pull request #1750 from brauner/2017-08-10/further_lxc_2.1_preparations
further lxc 2.1. preparations
2017-08-21 14:46:00 -05:00
Christian Brauner
7ec2e32ad7
conf{,ile}: warn user once about legacy config
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-21 18:06:20 +02:00
Christian Brauner
54a2454f4c
tools: use "which"
Somehow "type" doesn't really work.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-21 17:33:30 +02:00
Christian Brauner
555200a6f4
tools: add lxc-update-config.in
This tool can be used to switch from a pre 2.1 to a 2.1 config file.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-21 17:19:16 +02:00
Christian Brauner
35ec13c567
confile: lxc.id_map --> lxc.idmap
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-21 17:03:40 +02:00
Christian Brauner
4393ebc3bf Merge pull request #1752 from stgraber/master
Add CONFIG_NETFILTER_XT_MATCH_COMMENT to lxc-checkconfig
2017-08-20 13:54:51 +02:00
Stéphane Graber
308d9075e9
Add CONFIG_NETFILTER_XT_MATCH_COMMENT to lxc-checkconfig
Closes https://github.com/lxc/lxd/issues/3685

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2017-08-19 12:28:46 -04:00
Christian Brauner
c8313003e8
test: add test to get subkeys
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-16 01:51:31 +02:00
Christian Brauner
fe9b7349dd
confile: list namespaced keys
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-16 01:48:20 +02:00
Christian Brauner
300df83ecf
confile: lxc_getconfig() -> lxc_get_config()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-16 01:05:06 +02:00
Stéphane Graber
0c9a9339d9 Merge pull request #1746 from brauner/2017-08-10/further_lxc_2.1_preparations
further lxc 2.1 preparations
2017-08-15 16:55:33 -04:00
Christian Brauner
7451daf89d
confile: improve get_network_config_ops()
- handle lxc.net.<idx> keys without any subkey
- allow caller to pass NULL if caller doesn't need to retrieve deindexed key

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-15 22:11:25 +02:00
Christian Brauner
e45d720486
storage: add overlay as valid backend
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-15 20:02:45 +02:00
Serge Hallyn
065055b6d5 Merge pull request #1739 from keloyang/mem-leak
Fix mem leak with realpath
2017-08-12 09:55:40 -05:00
Stéphane Graber
42139323ba
Revert "debian: jessie and stretch keyring support"
This reverts commit 87eacd4d49.

While that commit looks right, the actual signing key doesn't match and
debootstrap therefore fails to bootstrap, as can be seen here:

https://jenkins.linuxcontainers.org/view/All/job/lxc-template-debian/

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2017-08-11 15:06:02 -04:00
Shukui Yang
e58e6e11ef Fix mem leak with realpath
Signed-off-by: Shukui Yang <yangshukui@huawei.com>
2017-08-11 17:12:24 +08:00
Christian Brauner
a5448c1530
confile: move lxc_list_net()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-11 00:30:09 +02:00
Christian Brauner
cfc6762681
confile: lxc_listconfigs -> lxc_list_config_items
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-11 00:22:12 +02:00
Christian Brauner
3aea1a7643
confile: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-11 00:13:25 +02:00
Christian Brauner
01f55c4098
confile: rework lxc_list_net()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-11 00:11:34 +02:00
Christian Brauner
70c1e708fa
confile: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-10 23:48:59 +02:00
Christian Brauner
49072f06f7
confile: cleanup
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-10 23:45:37 +02:00
Stéphane Graber
d17a217910 Merge pull request #1738 from brauner/2017-08-10/fix_android
android: fix includes
2017-08-10 17:41:18 -04:00
Christian Brauner
a3cbac3290
android: fix includes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-10 23:17:36 +02:00
Stéphane Graber
f111a899b9 Merge pull request #1736 from brauner/2017-08-08/fix_gcc_warnings
cgfsng: do not use uninitialized variable
2017-08-10 15:06:26 -04:00
Christian Brauner
462a15ef68
lxccontainer: remove 5s timeout
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-08-10 20:30:06 +02:00