Commit Graph

2861 Commits

Author SHA1 Message Date
Robert Vogelgesang
d703c2b15a cgroupfs: cpuset support for kernels without cgroup.clone_children
Hi,

as promised last week, here's my patch for cpuset cgroup support for
kernels without the cgroup.clone_children feature.

My initial patch used "#include <linux/version.h>" and the macros defined
there to decide if cgroup.clone_children should be used or not.  After
having seen Serge Hallyn's patch which he posted to the list last Wednesday,
where he used stat() to check if the cgroup.clone_children file is there,
I rewrote my patch to do the same.

The patch is against 1.0.0.beta3, and it is tested successfully with
RHEL-6's kernel version 2.6.32-431.3.1.el6, compiled without cgmanager
(I've so far not tried to use cgmanager in RHEL-6).

In addition to fixing the cpuset cgroup setup, this patch also fixes a
wrong argument in a call to handle_cgroup_settings() in the same context.

	Robert

Signed-off-by: Robert Vogelgesang <vogel@users.sourceforge.net>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-01-29 09:07:28 +00:00
Stéphane Graber
9749441a0e
gentoo: Fix /dev/tun generation
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-28 12:22:06 +00:00
Stéphane Graber
705bfae0d8 gentoo: Add basic userns config
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-28 09:57:46 +00:00
gza
1609f0fbe1 gentoo: fix comments about hardened
Signed-off-by: gza <github.guillaume@zitta.fr>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-28 09:57:42 +00:00
gza
cae3584efc gentoo: template rework
Now splited config 2 settings available
* common
** featureful oriented settings
* moresecure
** security oriented

Signed-off-by: gza <github.guillaume@zitta.fr>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-28 09:57:39 +00:00
gza
2562784e95 gentoo: fix typo, may break host init system
Signed-off-by: gza <github.guillaume@zitta.fr>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-28 09:57:36 +00:00
S.Çağlar Onur
8ac1837774 export lxc_cmd_get_config_item via API and use in lxc-info
This allows external users to query network related config items
from the running containers.

changes since v1:
- function name change

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-27 23:03:14 +00:00
Stéphane Graber
4deda3b5dd
change version to 1.0.0.beta3 in configure.ac
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-27 13:52:20 +00:00
Serge Hallyn
c59ce7de5e attach test: always flush stdout
Otherwise, after a fork, both pids may be flushing.  When
redirecting output to a file, this causes duplicate (or really
far worse) output.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-27 12:13:39 +00:00
Stéphane Graber
b56661fead lxc-download: Tweak cache location
- Also include the variant in the path
 - Fix invalid LXC_CACHE_BASE
 - Drop redundant code

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-27 09:43:56 +00:00
Luka Perkov
6849cb5b57 lxccontainer: fix whitespaces
Signed-off-by: Luka Perkov <luka.perkov@sartura.hr>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-27 09:09:37 +00:00
KATOH Yasufumi
ef65fe134f doc: fix the SEE ALSO section of Japanese lxc-user-nic(1)
* update for commit e43157b4b2

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-27 09:08:26 +00:00
Stéphane Graber
f4a5c1b154 Ignore lxc-test-usernic
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-26 11:46:56 +00:00
Qiang Huang
487d80082f lxccontainer: remove PID file after lxc_start return
Make the way symmetric. This also fix the file leak in
daemon model.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-25 19:09:14 -05:00
S.Çağlar Onur
a684f0b77d close the fd on error
Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-25 18:49:18 -05:00
Serge Hallyn
0bc8db6b2f lxcapi_clone: exit early on snapshot clones
If the user explicitly asks for a snapshot clone (in which
case maybe_snap is not set), we cannot abide this currently.
Rather than exit later with more cryptic error messages, exit
out early.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-25 18:04:55 -05:00
Kaarle Ritvanen
691ac4a339 lxc-alpine: copy /etc/TZ to container if present
Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-25 18:04:46 -05:00
Stéphane Graber
843a58743e
lxc-download: Fix to work without mktemp
mktemp isn't always available in busybox.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 18:23:28 -05:00
Serge Hallyn
0996e18ad5 cgmanager: chown cgroups to the container root
After this patch, starting an unprivileged container using
cgmanager gets the cgroup chown to the container root, so
that it can install the cgmanager (proxy) and make cgroup
requests.

(Still desirable and not in this patch is the automatic setup of
/sys/fs/cgroup/manager/sock, which you can currently do with
two lxc.mount.entries)

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 17:27:44 -05:00
Stéphane Graber
a38c2e6f8d tests: Fix startone
- Fix cgroup test to work on multi-core systems
 - Drop user interaction

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 15:56:32 -05:00
Stéphane Graber
52d21d4051 conf: Fix clear_config_item on lxc.network entries
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 15:40:50 -05:00
Stéphane Graber
8cb8e496d0 tests: Fix lxc-user-nic path
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 14:25:15 -05:00
Stéphane Graber
e6c6d62287
tests: Fix python3 API test
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 14:00:02 -05:00
Stéphane Graber
53df623dbd
tests: Don't require user interaction in containertests
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 13:49:47 -05:00
Stéphane Graber
a1258e6dae
Fix previous change to use defined()
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 13:42:37 -05:00
Stéphane Graber
92e23841a2
Support __NR_set_ns as well.
Apparently some older systems didn't have __NR_setns but had __NR_set_ns.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 13:27:26 -05:00
Dwight Engen
e43157b4b2 doc: fix See Also lxc-usernet.conf -> lxc-usernet
Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 13:07:50 -05:00
Michael H. Warfield
08754f305b Update CentOS and Fedora templates to support archtectures option.
Added code to the CentOS and Fedora templates so that x86 32 bit containers
may be built on x86_64 platforms.  Like archectectures may also be trivially
used as well.

Option added is "-a {arch}".

Additionally cleaned up some bash specific logic.

Signed-off-by: Michael H. Warfield <mhw@WittsEnd.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 12:36:40 -05:00
Serge Hallyn
3ec1648d8e idmap_add_id: fix broken behavior
The geteuid() addition is being made the first element of the lxc_list,
but the first element is just a head whose entry is ignored.  Therefore
userns_exec_1() was starting its tasks without the caller's uid mapped
into the namespace.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 11:52:42 -05:00
Dwight Engen
9f2fd74c7b add lua-alt-getopt dependency
Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 11:52:39 -05:00
KATOH Yasufumi
3220ecebfc doc: Add Japanese lxc-config(1)
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-24 11:52:35 -05:00
Stéphane Graber
80a873c223 tests: Fix createtest
Drop 60s delay and clear config before loading it.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-24 11:33:45 -05:00
Stéphane Graber
0898897a3a tests: Remove containers after running clonetest
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-24 11:33:40 -05:00
Stéphane Graber
2ed29824dc tests: Drop 60s delay in shutdowntest
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-24 11:33:35 -05:00
Stéphane Graber
e8ff96bbf8 Fix destroy() crash when no config is loaded
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-24 11:33:31 -05:00
Stéphane Graber
068b3d0431 tests: Fix lxc-test-saveconfig cleanup
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-24 11:33:26 -05:00
Stéphane Graber
cc3afb1ef5 tests: Fix shutdown test
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-24 11:33:22 -05:00
Stéphane Graber
c85a40bc4d tests: Speed up lxc-test-usernic
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-24 11:33:18 -05:00
Stéphane Graber
8ced4fd4f7 tests: Tweak lxc-test-ubuntu to be faster
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-24 11:33:13 -05:00
Stéphane Graber
0e17b9c69b tests: Rework lxc-test-usernic
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-24 11:33:07 -05:00
Stéphane Graber
7059802cf0 tests: Fix cleanup in lxc-test-unpriv
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-24 11:33:01 -05:00
Stéphane Graber
73d3e0903c tests: Update lxc-test-unpriv
Update lxc-test-unpriv to be a bit simpler and more reliable.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-24 11:32:55 -05:00
Serge Hallyn
0b3a6504e5 get_mapped_rootid: fix description
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-01-23 14:51:42 -06:00
Serge Hallyn
2a9a80cb1c get_mapped_rootid: avoid using (uid_t) -1
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-01-23 14:50:18 -06:00
Serge Hallyn
1354955b02 lxc-clone: support unprivileged use
This also fixes unprivileged use of lxc-snapshot and lxc-rename.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2014-01-23 15:09:17 -05:00
Serge Hallyn
f6639e3bee cgm_get: support NULL value
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2014-01-23 13:35:50 -06:00
Stéphane Graber
bfb1bb94c8 Drop runapitests.sh
This script is outdated and unused.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2014-01-23 14:08:44 -05:00
Serge Hallyn
da10a5c6a2 Revert "cgroupfs: support older kernels without cgroup.clone_children"
This reverts commit 0a4d93787d.
2014-01-23 13:03:11 -06:00
Serge Hallyn
3e45c94884 Revert "bionic: Replace rindex by strrchr"
This reverts commit 86f0eb65a0.
2014-01-23 13:03:05 -06:00
Serge Hallyn
2edb53c7c8 Revert "cgroup.c: clean up for handle_cgroup_settings"
This reverts commit 032e28b767.
2014-01-23 13:02:25 -06:00