proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-16 03:46:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,356 Commits 6 Branches 17 Tags 29 MiB
f53b591652
Commit Graph

4356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Serge Hallyn
9504f141c2 Merge pull request #1015 from stewartbrodie/confile-value-quotes 
Allow configuration file values to be quoted
 2016-05-10 14:16:56 -05:00
Stewart Brodie
bd878deec3 Allow configuration file values to be quoted 
If the value starts and ends with matching quote characters, those
characters are stripped automatically.   Quote characters are the
single quote (') or double quote (").  The quote removal is done after
the whitespace trimming.

This is needed particularly in order that lxc.environment values may
have trailing spaces.  However, the quote removal is done for all values
in the parse_line function, as it has non-const access to the value.

Signed-off-by: Stewart Brodie <stewart@metahusky.net>
 2016-05-10 13:57:00 +01:00
Christian Brauner
2bec98546e Merge pull request #1014 from hallyn/2016-05-09/procnet 
Unshare netns after setting the userns mappings
 2016-05-09 23:37:42 +02:00
Serge Hallyn
5b1e83cbc4 Unshare netns after setting the userns mappings 
so that there is a root uid mapping for the /proc/net files.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
 2016-05-09 15:53:26 -05:00
Christian Brauner
fc5bc4a6b4 Merge pull request #1013 from hartnellfoster/bugfix_20160509 
Added OR statement for cases of ID = rhel in RHEL 7+
 2016-05-09 13:51:20 +02:00
Hartnell Foster
0395c47c64 Added OR statement for cases of ID = rhel in RHEL 7+ 
Signed-off-by: Hartnell Foster <hartnell.foster@bbc.co.uk>
 2016-05-09 12:42:56 +01:00
Serge Hallyn
972765f90f Merge pull request #1008 from brauner/bugfix_branch 
sync.c: use correct types
 2016-05-08 22:54:20 -05:00
Christian Brauner
d38c8d1691
sync.c: use correct types 
Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
 2016-05-08 15:39:25 +02:00
Christian Brauner
211a7794fc Merge pull request #1010 from creideiki/fix-cap-sys-resource-typo 
Change sys_resources to sys_resource.
 2016-05-08 11:19:48 +02:00
Karl-Johan Karlsson
19624ecae1 Change sys_resources to sys_resource. 
gentoo.moresecure.conf tries to drop the capability CAP_SYS_RESOURCES.
However, that capability doesn't exist, so the container doesn't start.
Change it to CAP_SYS_RESOURCE, according to capabilities(7).

Also correct the same typo in a comment in slackware.common.conf.

Signed-off-by: Karl-Johan Karlsson <creideiki@ferretporn.se>
 2016-05-08 10:46:36 +02:00
Serge Hallyn
bced9b015a Merge pull request #1005 from tych0/warn-about-unexpected-sync-size 
sync: fail on unexpected message sizes
 2016-05-06 18:16:21 -05:00
Tycho Andersen
fcd59cf0c8 sync: fail on unexpected message sizes 
I think (?) this may be related to our hanging monitor bug. Let's do this
anyway, as it's probably a good idea.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
 2016-05-06 11:21:39 -05:00
Christian Brauner
297dbb7b4f Merge pull request #1004 from Lisio/alpine-hostname 
Force DHCP client to send hostname
 2016-05-05 22:51:21 +02:00
Lisio
7f1473c315 Force DHCP client to send hostname 
Required for proper applying dnsmasq config entries.

Signed-off-by: Andrey Kostin <andrey@kostin.email>
 2016-05-05 17:59:28 +03:00
Christian Brauner
561067aa22 Merge pull request #998 from thtanaka/network-config 
Improve on the case where default networking config is incomplete
 2016-05-02 23:14:46 +02:00
Thomas Tanaka
bc3b327244 Improve on the case where default networking config is incomplete 
Signed-off-by: Thomas Tanaka <thomas.tanaka@oracle.com>
 2016-05-02 11:57:15 -07:00
Christian Brauner
5bb64b32b8 Merge pull request #997 from ysbnim/master 
Update Korean manuals
 2016-05-02 11:46:20 +02:00
Sungbae Yoo
f7fe38741d doc: Add logging option to Korean lxc-attach(1) 
Update for commit f43d63b

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
 2016-05-02 18:25:29 +09:00
Christian Brauner
25e032fb43 Merge pull request #995 from ar45/fix_system_error_init_container_failed 
set PyErr when Container.__init__ fails
 2016-05-01 23:42:15 +02:00
Christian Brauner
b4e73f49f3 Merge pull request #996 from ar45/add_network_type_to_keys 
Expose lxc.network.type through lxc_list_nicconfigs()
 2016-05-01 20:38:57 +02:00
Aron Podrigal
7483699228 Added type to keys in lxc_list_nicconfigs 
Signed-off-by: Aron Podrigal <aronp@guaranteedplus.com>
 2016-05-01 12:15:51 -04:00
Aron Podrigal
9dfb0ad9be Fixed - set PyErr when Container.__init__ fails 
When container init failed for whatever reason, previously it resulted
in a `SystemError: NULL result without error in PyObject_Call`
This will now result in a RuntimeError with the error message
previously printed to stderr.

Signed-off-by: Aron Podrigal <aronp@guaranteedplus.com>
 2016-05-01 11:38:33 -04:00
Stéphane Graber
0aeed838e7 Merge pull request #993 from walkerning/check-tty 
Check if the stdout is a terminal in lxc-checkconfig
 2016-05-01 04:17:42 +02:00
walkerning
8513d8cd02 Check if stdout is a terminal in lxc-checkconfig 
Let lxc-checkconfig write to non-tty stdout without color control
characters
Signed-off-by: walkerning <foxdoraame@gmail.com>
 2016-05-01 10:05:10 +08:00
Serge Hallyn
1970a777ed Merge pull request #991 from brauner/2016-04-28/less_syscall_for_lxc_ls 
2016 04 28/less syscall for lxc ls
 2016-04-29 13:26:26 -05:00
Christian Brauner
688cd8439d lxc-ls: non-functional changes 
Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
 2016-04-28 23:45:05 +02:00
Christian Brauner
6daa3ea5ba lxc-ls: use fewer syscalls when doing ipc 
Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
 2016-04-28 23:45:00 +02:00
Stéphane Graber
1bf4292e3f Merge pull request #978 from evgeni/lsb-init-scripts 
don't make sysv init scripts dependant on distribution specifics
 2016-04-25 15:55:49 +02:00
Christian Brauner
a14574ba84 Merge pull request #987 from tenforward/japanese 
doc: Add logging option to Japanese lxc-attach(1)
 2016-04-25 12:35:19 +02:00
KATOH Yasufumi
8359be8c82 doc: Add logging option to Japanese lxc-attach(1) 
Update for commit f43d63b

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
 2016-04-25 19:30:03 +09:00
Stéphane Graber
53d6eeded2 Update maintainers 
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
 2016-04-24 18:34:31 -04:00
Leonid Isaev
5590a671bc Initialize a pointer in split_init_cmd() to avoid gcc warnings 
gcc -Wall warns about uninitialized variables (-Wmaybe-uninitialized), and
-Werror makes it fatal. This change allows the build to succeed by NULL'ifying
the pointer passed to strtok_r().

Note that strtok_r(3) anyway ignores a non-NULL arg3 pointer on the 1st call
with non-NULL arg1 string.

Signed-off-by: Leonid Isaev <leonid.isaev@jila.colorado.edu>
Acked-by: Serge Hallyn <serge.hallyn@ubuntu.com>
 2016-04-22 16:29:13 -05:00
Serge Hallyn
1ee85fbcc4 Merge pull request #982 from brauner/2016-04-19/mimic_ssh 
use raw settings of ssh for pty
 2016-04-19 13:27:16 -05:00
Christian Brauner
a7c97a40ec use raw settings of ssh for pty 
Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
 2016-04-19 15:17:19 +02:00
Christian Brauner
cb730f0125 Merge pull request #981 from LynxChaus/master 
Switch console pty to raw mode.
 2016-04-18 21:25:41 +02:00
Andrey Jr. Melnikov
d389339970 Switch console pty to raw mode. Without this some ncurses-based programs behave incorrectly 
Signed-off-by: Andrey Jr. Melnikov <temnota.am@gmail.com>
 2016-04-18 19:16:08 +03:00
Evgeni Golov
3083782cf8 don't make sysv init scripts dependant on distribution specifics 
- /etc(/rc.d)?/init.d/functions does not exist on all distributions
- LSB does not define a message function without an explicit status
- Debian-derived systems add a log_daemon_msg for that

lets define an own log_daemon_msg as echo and try to load LSB init
functions afterwards, which might overload it with a nicer version

that way the init scripts should work on any system, without hard
dependencies on neither LSB nor /etc/init.d/functions

Closes #309 #310 #311

Signed-off-by: Evgeni Golov <evgeni@debian.org>
 2016-04-15 21:23:57 +02:00
Christian Brauner
85145234e7 Merge pull request #976 from evgeni/drop-syslog.target 
drop obsolete syslog.target from lxc.service.in
 2016-04-15 13:11:29 +02:00
Evgeni Golov
a5747ee708 drop obsolete syslog.target from lxc.service.in 
the target is obsolete since systemd v38 which everybody should have.

original patch by Daniel Baumann

Signed-off-by: Evgeni Golov <evgeni@debian.org>
 2016-04-14 18:03:29 +02:00
Stéphane Graber
da1eace1de Merge pull request #974 from ar45/lxc_python_create_with_tuple 
Fixed python-lxc reference to var before assignment
 2016-04-14 00:41:12 -04:00
Aron Podrigal
9cee41def4 Fixed python-lxc reference to var before assignment 
```
>>> c = lxc.Container('ct')
>>> c.create('debian', args=('-r', 'jessie'))
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/usr/lib/python3/dist-packages/lxc/__init__.py", line 229, in
create
    template_args['args'] = tuple(tmp_args)
UnboundLocalError: local variable 'tmp_args' referenced before
assignment
```

Signed-off-by: Aron Podrigal <aronp@guaranteedplus.com>
 2016-04-14 00:24:08 -04:00
Stéphane Graber
8157403674 Merge pull request #972 from evgeni/lsb-headers 
add missing lsb headers to sysvinit scripts
 2016-04-13 18:47:53 -04:00
Christian Brauner
dd132eaa27 Merge pull request #973 from evgeni/debian-no-rootpw 
do not set the root password in the debian template
 2016-04-14 00:32:56 +02:00
Evgeni Golov
515fb8d20c do not set the root password in the debian template 
closes #302

Signed-off-by: Evgeni Golov <evgeni@debian.org>
 2016-04-13 18:04:19 +02:00
Evgeni Golov
26ca5e5bcf add missing lsb headers to sysvinit scripts 
original patch by Daniel Baumann

closes #308

Signed-off-by: Evgeni Golov <evgeni@debian.org>
 2016-04-13 17:55:48 +02:00
Serge Hallyn
ba03fa64b9 Merge pull request #970 from brauner/2016-04-13/lxc_attach_log 
lxc-attach: error on -L/--pty-log + redirection
 2016-04-13 10:19:03 -05:00
Christian Brauner
804bd6e32f only execute last test when we are a pty 
Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
 2016-04-13 16:54:15 +02:00
Christian Brauner
e4be55c41f Merge pull request #971 from hallyn/2016-04-12/nosystemd 
cgfsng: don't require that systemd subsystem be mounted
 2016-04-13 16:40:19 +02:00
Christian Brauner
c87524b77b lxc-attach: error on -L/--pty-log + redirection 
pty logging only works correctly when stdout and stderr refer to a pty. If they
do not, we do not dup2() them and lxc_console_cb_con() will never write to the
corresponding log file descriptor.

When redirection on stdout and stderr is used we can safely assume that the user
is already logging to a file or /dev/null and creating an additional pty log
doesn't seem to make sense.

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
 2016-04-13 15:23:35 +02:00
Stéphane Graber
c4828d7416 Merge pull request #966 from evgeni/SOURCE_DATE_EPOCH 
nicer date format and support for SOURCE_DATE_EPOCH in LXC_GENERATE_DATE
 2016-04-12 15:38:01 -04:00