diff options
Diffstat (limited to 'recipes-containers/lxc/files')
6 files changed, 168 insertions, 0 deletions
diff --git a/recipes-containers/lxc/files/config_network_type-set-macvlan-default-mode-to-priv.patch b/recipes-containers/lxc/files/config_network_type-set-macvlan-default-mode-to-priv.patch new file mode 100644 index 00000000..8cb321bb --- /dev/null +++ b/recipes-containers/lxc/files/config_network_type-set-macvlan-default-mode-to-priv.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From 261658e80014c031852a024f8794dd7f2a2351ad Mon Sep 17 00:00:00 2001 | ||
2 | From: Bogdan Purcareata <bogdan.purcareata@freescale.com> | ||
3 | Date: Fri, 28 Mar 2014 10:31:41 -0400 | ||
4 | Subject: [PATCH] config_network_type: set macvlan default mode to private | ||
5 | |||
6 | If a default mode is not set, the container requires an explicit | ||
7 | mode specified in the config file, otherwise creating the | ||
8 | container fails. | ||
9 | |||
10 | Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com> | ||
11 | Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> | ||
12 | --- | ||
13 | src/lxc/confile.c | 6 +++++- | ||
14 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/lxc/confile.c b/src/lxc/confile.c | ||
17 | index d6cf151..90fb344 100644 | ||
18 | --- a/src/lxc/confile.c | ||
19 | +++ b/src/lxc/confile.c | ||
20 | @@ -303,6 +303,8 @@ out: | ||
21 | return ret; | ||
22 | } | ||
23 | |||
24 | +static int macvlan_mode(int *valuep, const char *value); | ||
25 | + | ||
26 | static int config_network_type(const char *key, const char *value, | ||
27 | struct lxc_conf *lxc_conf) | ||
28 | { | ||
29 | @@ -337,8 +339,10 @@ static int config_network_type(const char *key, const char *value, | ||
30 | |||
31 | if (!strcmp(value, "veth")) | ||
32 | netdev->type = LXC_NET_VETH; | ||
33 | - else if (!strcmp(value, "macvlan")) | ||
34 | + else if (!strcmp(value, "macvlan")) { | ||
35 | netdev->type = LXC_NET_MACVLAN; | ||
36 | + macvlan_mode(&netdev->priv.macvlan_attr.mode, "private"); | ||
37 | + } | ||
38 | else if (!strcmp(value, "vlan")) | ||
39 | netdev->type = LXC_NET_VLAN; | ||
40 | else if (!strcmp(value, "phys")) | ||
41 | -- | ||
42 | 1.9.rc1 | ||
43 | |||
diff --git a/recipes-containers/lxc/files/lxc-1.0.0-disable-udhcp-from-busybox-template.patch b/recipes-containers/lxc/files/lxc-1.0.0-disable-udhcp-from-busybox-template.patch new file mode 100644 index 00000000..723be277 --- /dev/null +++ b/recipes-containers/lxc/files/lxc-1.0.0-disable-udhcp-from-busybox-template.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | From d7e07e7acb1cbad33806f49143a2a30b4468c369 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bogdan Purcareata <bogdan.purcareata@freescale.com> | ||
3 | Date: Mon, 8 Apr 2013 18:30:19 +0300 | ||
4 | Subject: [PATCH] lxc-0.9.0-disable-udhcp-from-busybox-template | ||
5 | |||
6 | --- | ||
7 | templates/lxc-busybox.in | 1 - | ||
8 | 1 file changed, 1 deletion(-) | ||
9 | |||
10 | diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in | ||
11 | index cb425ec..bb8c951 100644 | ||
12 | --- a/templates/lxc-busybox.in | ||
13 | +++ b/templates/lxc-busybox.in | ||
14 | @@ -84,7 +84,6 @@ EOF | ||
15 | #!/bin/sh | ||
16 | /bin/syslogd | ||
17 | /bin/mount -a | ||
18 | -/bin/udhcpc | ||
19 | EOF | ||
20 | |||
21 | # executable | ||
22 | -- | ||
23 | 1.7.11.7 | ||
24 | |||
diff --git a/recipes-containers/lxc/files/lxc-busybox-follow-symlinks-when-inspecting-busybox-.patch b/recipes-containers/lxc/files/lxc-busybox-follow-symlinks-when-inspecting-busybox-.patch new file mode 100644 index 00000000..6882c16e --- /dev/null +++ b/recipes-containers/lxc/files/lxc-busybox-follow-symlinks-when-inspecting-busybox-.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 50dbb8209bf65e4d24ccd06d3ca05004d0ddc63c Mon Sep 17 00:00:00 2001 | ||
2 | From: Bogdan Purcareata <bogdan.purcareata@freescale.com> | ||
3 | Date: Mon, 24 Mar 2014 12:43:03 -0400 | ||
4 | Subject: [PATCH] lxc-busybox: follow symlinks when inspecting busybox binary | ||
5 | |||
6 | Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com> | ||
7 | Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> | ||
8 | --- | ||
9 | templates/lxc-busybox.in | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in | ||
13 | index e5a512a..246e743 100644 | ||
14 | --- a/templates/lxc-busybox.in | ||
15 | +++ b/templates/lxc-busybox.in | ||
16 | @@ -187,7 +187,7 @@ configure_busybox() | ||
17 | return 1 | ||
18 | fi | ||
19 | |||
20 | - file $(which busybox) | grep -q "statically linked" | ||
21 | + file -L $(which busybox) | grep -q "statically linked" | ||
22 | if [ $? -ne 0 ]; then | ||
23 | echo "warning : busybox is not statically linked." | ||
24 | echo "warning : The template script may not correctly" | ||
25 | -- | ||
26 | 1.9.rc1 | ||
27 | |||
diff --git a/recipes-containers/lxc/files/network.c-Add-missing-LXC_NET_NONE-option-refactor.patch b/recipes-containers/lxc/files/network.c-Add-missing-LXC_NET_NONE-option-refactor.patch new file mode 100644 index 00000000..81fde835 --- /dev/null +++ b/recipes-containers/lxc/files/network.c-Add-missing-LXC_NET_NONE-option-refactor.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | From b343592b45c91db8c18e863fac5ab8eeb94445d6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Bogdan Purcareata <bogdan.purcareata@freescale.com> | ||
3 | Date: Wed, 26 Mar 2014 11:35:09 -0400 | ||
4 | Subject: [PATCH] network.c: Add missing LXC_NET_NONE option + refactor | ||
5 | |||
6 | Add LXC_NET_NONE to known lxc_network_types, so parsing a config | ||
7 | file with lxc.network.type = none does not result in failure | ||
8 | (e.g. doc/examples/lxc-no-netns.conf). Options have also been | ||
9 | reordered to match the enum in conf.h. | ||
10 | |||
11 | Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com> | ||
12 | Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> | ||
13 | --- | ||
14 | src/lxc/network.c | 5 +++-- | ||
15 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/src/lxc/network.c b/src/lxc/network.c | ||
18 | index 090b9bd..a9900de 100644 | ||
19 | --- a/src/lxc/network.c | ||
20 | +++ b/src/lxc/network.c | ||
21 | @@ -1202,11 +1202,12 @@ int lxc_bridge_attach(const char *bridge, const char *ifname) | ||
22 | } | ||
23 | |||
24 | static const char* const lxc_network_types[LXC_NET_MAXCONFTYPE + 1] = { | ||
25 | + [LXC_NET_EMPTY] = "empty", | ||
26 | [LXC_NET_VETH] = "veth", | ||
27 | [LXC_NET_MACVLAN] = "macvlan", | ||
28 | - [LXC_NET_VLAN] = "vlan", | ||
29 | [LXC_NET_PHYS] = "phys", | ||
30 | - [LXC_NET_EMPTY] = "empty", | ||
31 | + [LXC_NET_VLAN] = "vlan", | ||
32 | + [LXC_NET_NONE] = "none", | ||
33 | }; | ||
34 | |||
35 | const char *lxc_net_type_to_str(int type) | ||
36 | -- | ||
37 | 1.9.rc1 | ||
38 | |||
diff --git a/recipes-containers/lxc/files/run-ptest b/recipes-containers/lxc/files/run-ptest new file mode 100644 index 00000000..23a6256b --- /dev/null +++ b/recipes-containers/lxc/files/run-ptest | |||
@@ -0,0 +1,4 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | make -C src/tests -k check-TESTS | ||
4 | |||
diff --git a/recipes-containers/lxc/files/runtest.patch b/recipes-containers/lxc/files/runtest.patch new file mode 100644 index 00000000..e4e034b2 --- /dev/null +++ b/recipes-containers/lxc/files/runtest.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | Add install-ptest rule. | ||
2 | |||
3 | Signed-off-by: Mihaela Sendrea <mihaela.sendrea@enea.com> | ||
4 | Upstream-status: Pending | ||
5 | |||
6 | diff -uNr a/src/tests/Makefile.am b/src/tests/Makefile.am | ||
7 | --- a/src/tests/Makefile.am 2014-04-07 16:25:59.246238815 +0300 | ||
8 | +++ b/src/tests/Makefile.am 2014-04-10 18:09:43.195772467 +0300 | ||
9 | @@ -54,6 +54,23 @@ | ||
10 | |||
11 | endif | ||
12 | |||
13 | +TESTS = lxc-test-containertests lxc-test-locktests \ | ||
14 | + lxc-test-getkeys lxc-test-lxcpath lxc-test-cgpath lxc-test-console \ | ||
15 | + lxc-test-snapshot lxc-test-concurrent lxc-test-may-control \ | ||
16 | + lxc-test-reboot lxc-test-list lxc-test-attach lxc-test-device-add-remove | ||
17 | + | ||
18 | +buildtest-TESTS: $(TESTS) | ||
19 | + | ||
20 | +install-ptest: | ||
21 | + install -d $(TEST_DIR) | ||
22 | + install -D ../lxc/liblxc.so $(TEST_DIR)/../lxc/liblxc.so | ||
23 | + install -D ../../config/test-driver $(TEST_DIR)/../../config/test-driver | ||
24 | + cp Makefile $(TEST_DIR) | ||
25 | + @(for file in $(TESTS); do install $$file $(TEST_DIR); done;) | ||
26 | + sed -i 's|^Makefile:|_Makefile:|' $(TEST_DIR)/Makefile | ||
27 | + sed -i 's|^all-am:|_all-am:|' $(TEST_DIR)/Makefile | ||
28 | + sed -i -e 's|^\(.*\.log:\) \(.*EXEEXT.*\)|\1|g' $(TEST_DIR)/Makefile | ||
29 | + | ||
30 | EXTRA_DIST = \ | ||
31 | cgpath.c \ | ||
32 | clonetest.c \ | ||