Commit Graph

3388 Commits

Author SHA1 Message Date
Patrick Toomey
56f8ff00e3 Set UID/GID to parent value for lxc-execute
Signed-off-by: Patrick Toomey <ptoomey3@biasedcoin.com>
2015-08-28 08:25:07 -06:00
Patrick Toomey
e06155c9ab Do not switch to root for lxc-execute
Signed-off-by: Patrick Toomey <ptoomey3@biasedcoin.com>
2015-08-28 08:24:11 -06:00
Stéphane Graber
814d049da4 Merge pull request #579 from fanyeren/patch-11
debian template: reconfigure locales
2015-07-01 15:19:46 -04:00
有张纸
114eb32f24 debian template: reconfigure locales
Signed-off-by: feng xiahou <xiahoufeng@yahoo.com>
2015-07-01 23:39:08 +08:00
KATOH Yasufumi
dc80aa9cb0 Support unprivileged ephemeral container using aufs
As the commit 31a882e, an unprivileged container can use aufs.
This patch removes the check for unpriv aufs, and change the path of
xino file as an unprivileged user can mount aufs.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-06-30 15:18:17 -04:00
KATOH Yasufumi
b0c8058323 doc: Update Japanese lxc-usernet(5) for supporting usergroups
Update for commit 1940bff, and fix typo in English man

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
2015-06-30 15:17:30 -04:00
KATOH Yasufumi
da7b32317a plamo: Support LXC_CACHE_PATH
lxc-plamo supports LXC_CACHE_PATH that is introduced at commit 6dc6f80

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-06-30 15:17:05 -04:00
Stéphane Graber
1084182111 Merge pull request #540 from ysbnim/master
config: miscellaneous signals for lxc.*signal
2015-06-30 15:04:43 -04:00
Stéphane Graber
7c3fb6bf10 Merge pull request #545 from bogen/master
The yum in Centos 5.11 does not know about '--releasever', which is u…
2015-06-30 15:03:51 -04:00
Stéphane Graber
a42989df60 Merge pull request #552 from lrowe/patch-1
Wait on correct container name
2015-06-30 15:01:17 -04:00
Stéphane Graber
82e4093384 Merge pull request #561 from ysbnim/kor_manual
Add Korean man pages
2015-06-30 15:00:53 -04:00
Stéphane Graber
8b9d08041e Merge pull request #576 from fanyeren/patch-10
debootstrap failed when $GREP_OPTIONS color is set
2015-06-30 15:00:29 -04:00
Serge Hallyn
8e13cca944 systemd: fix lxc-containers vs lxc-net ordering (v3)
Per pitti's suggestion, use After= to force lxc to wait for lxc-net to finish
running.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Reviewed-By: Martin Pitt <martin.pitt@ubuntu.com>
2015-06-30 09:34:09 -05:00
有张纸
192dbe6fdc debootstrap failed when $GREP_OPTIONS is set
debootstrap failed when $GREP_OPTIONS is set, so we need to unset it in the template

Signed-off-by: <feng xiahou xiahoufeng@yahoo.com>
2015-06-30 16:23:11 +08:00
Stéphane Graber
dfb5edcac0 lxc-net: Use iproute and relative paths everywhere (V2)
V2 changes:
 - Keep using /var/lib for the lease file, but making it respect localstatedir
 - Don't pass an empty --conf-file as that confuses dnsmasq when
   /etc/dnsmasq.conf doesn't exist or isn't readable.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-06-29 13:36:55 -04:00
Arjun Sreedharan
57354986d6 lxc_monitor: fix memory leak on @fds and close fds
also label and consolidate error conditions for
better readability

Signed-off-by: Arjun Sreedharan <arjun024@gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
2015-06-29 09:58:43 -05:00
Serge Hallyn
d791668b9a lxc_user_nic: free_groupnames: fix
lxc_user_nic was segfaulting:
lxc-user-nic[9761]: segfault at 29 ip 00007f3fb2346872 sp 00007ffdd17b2dd0 error 4 in libc-2.21.so[7f3fb22c2000+1c0000

This patch fixes it.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2015-06-24 13:07:05 -05:00
Serge Hallyn
2c7a50081b Merge pull request #517 from hkjolhede/master
Added support for groups in lxc-usernet
2015-06-23 16:10:26 -05:00
Henrik Kjölhede
680836fa52 Make sure to cleanup and exit with an error if malloc fails in append_alloted
Signed-off-by: Henrik Kjölhede <hkjolhede@gmail.com>
2015-06-21 11:13:01 +02:00
Stéphane Graber
16fc3582a4 Merge pull request #572 from fanyeren/patch-9
Update centos.common.conf.in
2015-06-18 04:05:56 +02:00
有张纸
28468a67cb Update centos.common.conf.in
systemd services like logind and journald need CAP_SETFCAP CAP_SETPCAP
2015-06-17 14:56:08 +08:00
Stéphane Graber
ccb17e9f8a Merge pull request #569 from LenzGr/master
use `hostname` for DHCP_HOSTNAME in ifcfg-eth0
2015-06-16 16:24:29 +02:00
Lenz Grimmer
7e1a946f61 use hostname for DHCP_HOSTNAME in ifcfg-eth0
Updated centos/fedora/oracle templates to use `hostname` for DHCP_HOSTNAME in
/etc/sysconfig/network/ifcfg-eth0, so the container's host name is propagated
to the host's DHCP server (e.g. dnsmasq, which also acts as the DNS server).
This resolves lxc/lxd#756

Signed-off-by: Lenz Grimmer <lenz@grimmer.com>
2015-06-16 14:00:49 +02:00
Stéphane Graber
60978799df Merge pull request #564 from devurandom/fix/gentoo-systemd-caps
Adopt capability (lxc.cap.drop) documentation from other distros in Gentoo config, drop setpcap and sys_nice
2015-06-15 16:47:27 +02:00
Dennis Schridde
00ec0cc72c Adopt capability drop explanations from other distros on Gentoo, drop setpcap,sys_nice caps
Documents setpcap,sys_admin,sys_resources as breaking systemd, but does not drop them from lxc.cap.drop, as the default init system on Gentoo is OpenRC, thus stuff breaking systemd can be blocked anyway.

This also drops setpcap and sys_nice caps, as these are also dropped in other non-systemd distros.

Most of the explanatory blurb was copied from other distros' configs.

See-Also: https://bugs.gentoo.org/show_bug.cgi?id=551792

Signed-Off-By: Dennis Schridde <devurandom@gmx.net>
2015-06-13 09:56:31 +02:00
Serge Hallyn
13353dc420 daemonized start: exit children on failure, don't return
When starting a daemonized container, only the original parent
thread should return to the caller.  The first forked child
immediately exits after forking, but the grandparent child
was in some places returning on error - causing a second instance
of the calling function.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Tycho Andersen <tycho.andersen@canonical.com>
2015-06-12 16:11:53 -05:00
Stéphane Graber
2badf64b39 Merge pull request #567 from ysbnim/jap_manual_patch
Translate untranslated section titles in Japanese man pages
2015-06-12 06:48:31 +02:00
Stéphane Graber
dbf21ae6dc Merge pull request #558 from cloudnull/template-cache-var
Added container-cache option to templates
2015-06-12 06:43:21 +02:00
Sungbae Yoo
51fded061a doc: Translate untranslated section titles in Japanese man pages
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2015-06-12 10:29:58 +09:00
Kevin Carter
6dc6f80bfd Added container-cache option to templates
This change adds in the container-cache option within the mainline
default lxc templates. The pupose here is to allow a template to
pull from a location that may not be `@LOCALSTATEDIR@/cache/lxc`

Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
2015-06-11 11:21:17 -05:00
Stéphane Graber
3814bc62d1 Merge pull request #563 from devurandom/fix/gentoo-mount-create-dir
Fix creation of dev/mqueue and dev/shm on Gentoo
2015-06-11 15:27:01 +02:00
Dennis Schridde
bc19636d58 Fix creation of dev/mqueue and dev/shm on Gentoo
The dev/mqueue and dev/shm directories do not exist when using lxc.autodev, thus they have to be created upon mount.

Signed-off-by: Dennis Schridde <devurandom@gmx.net>
2015-06-11 15:21:19 +02:00
Sungbae Yoo
2b371b262f doc: Add Korean man pages
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2015-06-11 20:08:58 +09:00
Stéphane Graber
963abb4688 Merge pull request #560 from fanyeren/patch-8
Update lxc-oracle.in fix a bug
2015-06-11 05:34:55 -04:00
有张纸
761fbd510c Update lxc-oracle.in 2015-06-11 12:50:50 +08:00
Tycho Andersen
69aeabac1a uniformly nullify std fds
In various places throughout the code, we want to "nullify" the std fds,
opening them to /dev/null or zero or so. Instead, let's unify this code and do
it in such a way that Coverity (probably) won't complain.

v2: use /dev/null for stdin as well
v3: add a comment about use of C's short circuiting
v4: axe comment, check errors on dup2, s/quiet/need_null_stdfds

Reported-by: Coverity
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2015-06-10 23:04:51 -05:00
Tycho Andersen
5b72de5fd3 move utils.h #endif to end of file
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2015-06-10 23:04:47 -05:00
Tycho Andersen
bd9e78f570 c/r: remove unused variable mnts
Reported-by: Coverity
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2015-06-10 23:04:45 -05:00
Tycho Andersen
3158ab5b9e c/r: use fclose instead of close
We're leaking the FILE* here while closing the underlying fd; let's just
close the file and thus close both.

Reported-by: Coverity
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2015-06-10 23:04:43 -05:00
Sungbae Yoo
89dfc30230 config: miscellaneous signals for lxc.*signal
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
2015-06-10 17:58:36 +09:00
Henrik Kjölhede
21002b3950 Fixed memory checks and faulty loop in get_alloted according to comments
Signed-off-by: Henrik Kjölhede <hkjolhede@gmail.com>
2015-06-09 22:25:16 +02:00
Stéphane Graber
2a5da24387 Merge pull request #557 from dangowrt/fix-build-on-ppc
fix build on mpc85xx
2015-06-09 07:21:33 -04:00
Daniel Golle
f58ad87a3f fix build on mpc85xx
Initialize ret to 0 so compiler no longer complains about
monitor.c: In function 'lxc_monitor_open':
monitor.c:212:5: error: 'ret' may be used uninitialized in this function [-Werror=maybe-uninitialized]

https://github.com/openwrt/packages/issues/1356

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2015-06-09 12:58:12 +02:00
Laurence Rowe
da0e298c67 Wait on correct container name
Signed-off-by: Laurence Rowe <l@lrowe.co.uk>
2015-06-08 14:43:24 -07:00
Serge Hallyn
d9b32b0900 coverity: don't risk exec()ing NULL
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2015-06-08 10:37:55 -05:00
Serge Hallyn
17d252a822 coverity: fix use-after-free in cgmanager.
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
2015-06-08 10:33:22 -05:00
Henrik Kjölhede
1940bff4d2 Updated the documentation
Signed-off-by: Henrik Kjölhede <hkjolhede@gmail.com>
2015-06-04 22:22:54 +02:00
Stéphane Graber
212bc24189
Fix bdev.h
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2015-06-03 21:45:23 -04:00
Stéphane Graber
c2af52cf52
Revert bdev.h to the way it was
Instead of re-defining MS_ options all over the place, just revert the
last change to bdev.h so we have all the defines in there again.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2015-06-03 19:37:59 -04:00
Stéphane Graber
54c0610037
Define MS_RELATIME for Android
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2015-06-03 17:08:11 -04:00