]> git.proxmox.com Git - mirror_lxc.git/log
mirror_lxc.git
7 years agoMerge pull request #1043 from stgraber/master
Christian Brauner [Tue, 7 Jun 2016 19:29:52 +0000 (21:29 +0200)]
Merge pull request #1043 from stgraber/master

Drop lxc-devsetup as unneeded by current autodev

8 years agoDrop lxc-devsetup as unneeded by current autodev
Stéphane Graber [Tue, 7 Jun 2016 19:10:24 +0000 (15:10 -0400)]
Drop lxc-devsetup as unneeded by current autodev

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
8 years agoMerge pull request #1042 from GreatFruitOmsk/python-rpath
Christian Brauner [Mon, 6 Jun 2016 10:49:27 +0000 (12:49 +0200)]
Merge pull request #1042 from GreatFruitOmsk/python-rpath

python-lxc: follow global rpath setting for autotools builds

8 years agopython-lxc: follow global rpath setting for autotools builds
Aleksandr Mezin [Mon, 6 Jun 2016 01:50:59 +0000 (07:50 +0600)]
python-lxc: follow global rpath setting for autotools builds

When LXC is configured with --enable-rpath, I expect Python bindings
to be able to find the library in a non-standard location, just like
LXC command-line tools.

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
8 years agoMerge pull request #1040 from odyssey4me/include_apt_transport_https
Stéphane Graber [Fri, 3 Jun 2016 15:37:02 +0000 (11:37 -0400)]
Merge pull request #1040 from odyssey4me/include_apt_transport_https

Move apt-transport-https to global packages_template

8 years agoMove apt-transport-https to global packages_template
Jesse Pretorius [Fri, 3 Jun 2016 15:33:25 +0000 (16:33 +0100)]
Move apt-transport-https to global packages_template

In many environments the preference is to configure containers with
apt mirrors that are SSL-secured.

When building containers using the download template this can't be
done unless an insecure mirror is first used to install the
apt-transport-https package, then the sources reconfigured to
use the https URL.

When building containers without using the download template this
can't be done unless the container creator specifically includes
this package in the package list at build time. It seems more
intuitive to me to have the package installed by default.

Commit 396f75abb3d319adc7d871b94b08bc6bb9c49585 added the package
to the minbase variant, but this variant is not used by the download
template build process. The build process instead specifies no
variant, so this patch moves the package from the packages_template
package list in the minbase variant to the global packages_template
package list, ensuring that this package is included in all Ubuntu
build images that use the lxc-ubuntu template.

Signed-off-by: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
8 years agoMerge pull request #1037 from evgeni/lxc.service-simple
Stéphane Graber [Thu, 2 Jun 2016 13:44:31 +0000 (09:44 -0400)]
Merge pull request #1037 from evgeni/lxc.service-simple

start containers in foreground when using the lxc@.service

8 years agostart containers in foreground when using the lxc@.service
Evgeni Golov [Thu, 2 Jun 2016 13:38:47 +0000 (15:38 +0200)]
start containers in foreground when using the lxc@.service

lxc-start started to default to daemonize the container when starting
this conflicts with type=simple of the systemd unit

call lxc-start with -F and thus force execution in foreground
that way we can feed the log to journald properly and keep type=simple

Debian-Bug: https://bugs.debian.org/826100
Signed-off-by: Evgeni Golov <evgeni@golov.de>
8 years agoMerge pull request #1036 from GreatFruitOmsk/python-setuptools
Stéphane Graber [Tue, 31 May 2016 19:40:46 +0000 (15:40 -0400)]
Merge pull request #1036 from GreatFruitOmsk/python-setuptools

python-lxc: fix breakage caused by the switch to setuptools

8 years agopython-lxc: put egg-info into build directory
Aleksandr Mezin [Tue, 31 May 2016 11:36:23 +0000 (17:36 +0600)]
python-lxc: put egg-info into build directory

To keep source directory clean.

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
8 years agopython-lxc: always set --root for install command
Aleksandr Mezin [Tue, 31 May 2016 11:33:59 +0000 (17:33 +0600)]
python-lxc: always set --root for install command

This implies '--single-version-externally-managed', which we
actually want for autotools builds.

Fixes current problems with jenkins test suite.

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
8 years agoMerge pull request #1035 from GreatFruitOmsk/python-setuptools
Stéphane Graber [Tue, 31 May 2016 04:19:29 +0000 (00:19 -0400)]
Merge pull request #1035 from GreatFruitOmsk/python-setuptools

python-lxc: use setuptools instead of distutils

8 years agopython-lxc: use setuptools instead of distutils
Aleksandr Mezin [Mon, 30 May 2016 21:13:24 +0000 (03:13 +0600)]
python-lxc: use setuptools instead of distutils

setuptools is recommended by Python Packaging Guide
https://python-packaging-user-guide.readthedocs.io/en/latest/current/

It contains some useful extensions like 'develop' command. Also it
is required for building wheels AFAIK.

The only downside is an extra build-time dependency. setuptools are
packaged in both Debian and Ubuntu (python3-setuptools), as well as
other major distros, so it shouldn't be an issue, I think.

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
8 years agoMerge pull request #1034 from GreatFruitOmsk/master
Stéphane Graber [Sat, 28 May 2016 19:21:16 +0000 (15:21 -0400)]
Merge pull request #1034 from GreatFruitOmsk/master

python-lxc: change distribution name _lxc -> lxc

8 years agopython-lxc: change distribution name _lxc -> lxc
Aleksandr Mezin [Sat, 28 May 2016 07:40:15 +0000 (13:40 +0600)]
python-lxc: change distribution name _lxc -> lxc

Distribution name starting with underscore is considered invalid by
many tools. For example, you can't list such name in
install_requires in your setup.py.

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
8 years agoMerge pull request #1032 from GreatFruitOmsk/travis-vpath
Stéphane Graber [Fri, 27 May 2016 17:56:49 +0000 (13:56 -0400)]
Merge pull request #1032 from GreatFruitOmsk/travis-vpath

travis: test VPATH builds

8 years agoMerge pull request #1031 from GreatFruitOmsk/pypi
Stéphane Graber [Fri, 27 May 2016 17:55:40 +0000 (13:55 -0400)]
Merge pull request #1031 from GreatFruitOmsk/pypi

python-lxc: enable standalone builds

8 years agopython-lxc: search for lxc library and headers using pkg-config
Aleksandr Mezin [Fri, 27 May 2016 11:58:15 +0000 (17:58 +0600)]
python-lxc: search for lxc library and headers using pkg-config

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
8 years agotravis: ensure 'make install' doesn't fail
Aleksandr Mezin [Fri, 27 May 2016 15:40:13 +0000 (21:40 +0600)]
travis: ensure 'make install' doesn't fail

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
8 years agotravis: test VPATH builds
Aleksandr Mezin [Fri, 27 May 2016 12:47:23 +0000 (18:47 +0600)]
travis: test VPATH builds

It looks like VPATH (split source and build directories) builds
are frequently broken. So let's test them on travis-ci.

Personally I use VPATH build in my deployment scripts.

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
8 years agopython-lxc: pass include/library dirs as arguments to setup.py
Aleksandr Mezin [Fri, 27 May 2016 09:38:42 +0000 (15:38 +0600)]
python-lxc: pass include/library dirs as arguments to setup.py

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
8 years agopython-lxc: don't use private lxc/confile.h
Aleksandr Mezin [Fri, 27 May 2016 09:13:18 +0000 (15:13 +0600)]
python-lxc: don't use private lxc/confile.h

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
8 years agopython-lxc: don't use private lxc/utils.h
Aleksandr Mezin [Thu, 26 May 2016 10:07:28 +0000 (16:07 +0600)]
python-lxc: don't use private lxc/utils.h

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
8 years agopython-lxc: don't use private lxc/namespace.h
Aleksandr Mezin [Thu, 26 May 2016 10:03:57 +0000 (16:03 +0600)]
python-lxc: don't use private lxc/namespace.h

Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
8 years agoMerge pull request #1029 from joerg-krause/master
Christian Brauner [Mon, 23 May 2016 19:29:49 +0000 (21:29 +0200)]
Merge pull request #1029 from joerg-krause/master

Fix redefinition of struct in6_addr

8 years agoFix redefinition of struct in6_addr
Jörg Krause [Thu, 19 May 2016 19:51:27 +0000 (21:51 +0200)]
Fix redefinition of struct in6_addr

struct in6_addr is both defined in the C library header <netinet/in.h>
and the Linux kernel header <linux/in6.h>.

lxc_user_nic.c includes both <netinet/in.h> and <linux/if_bridge.h>. The
later one includes <linux/in6.h>.

This breaks build with the musl libc:
  error: redefinition of ‘struct in6_addr’

As lxc_user_nic.c does not use any references from <linux/if_bridge.h> it
is safe to remove this header.

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
8 years agoMerge pull request #1022 from Lisio/master
Stéphane Graber [Wed, 11 May 2016 20:41:00 +0000 (16:41 -0400)]
Merge pull request #1022 from Lisio/master

Fix hostname in interface config for apline template

8 years agoFix hostname in interface config for apline template
Andrey Kostin [Wed, 11 May 2016 20:32:40 +0000 (23:32 +0300)]
Fix hostname in interface config for apline template

Signed-off-by: Andrey Kostin <andrey@kostin.email>
8 years agoMerge pull request #1021 from odyssey4me/include_apt_transport_https
Stéphane Graber [Wed, 11 May 2016 17:41:48 +0000 (13:41 -0400)]
Merge pull request #1021 from odyssey4me/include_apt_transport_https

Add apt-transport-https to minbase variant packages_template

8 years agoAdd apt-transport-https to minbase variant packages_template
Jesse Pretorius [Wed, 11 May 2016 17:17:58 +0000 (18:17 +0100)]
Add apt-transport-https to minbase variant packages_template

In many environments the preference is to configure containers with
apt mirrors that are SSL-secured.

When building containers using the download template this can't be
done unless an insecure mirror is first used to install the
apt-transport-https package, then the sources reconfigured to
use the https URL.

When building containers without using the download template this
can't be done unless the container creator specifically includes
this package in the package list at build time.

It seems more intuitive to me to have the package installed by
default. This patch includes the required package for the minbase
variant only as this is the default.

Signed-off-by: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
8 years agoMerge pull request #1020 from stgraber/master
Christian Brauner [Wed, 11 May 2016 17:17:13 +0000 (19:17 +0200)]
Merge pull request #1020 from stgraber/master

Also allow fstype=fuse for fuse filesystems

8 years agoAlso allow fstype=fuse for fuse filesystems
Stéphane Graber [Wed, 11 May 2016 16:59:23 +0000 (12:59 -0400)]
Also allow fstype=fuse for fuse filesystems

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
8 years agoMerge pull request #1019 from tych0/dont-force-irmap
Christian Brauner [Wed, 11 May 2016 14:47:50 +0000 (16:47 +0200)]
Merge pull request #1019 from tych0/dont-force-irmap

Dont force irmap

8 years agoc/r: add an option to use faster inotify support in CRIU
Tycho Andersen [Wed, 11 May 2016 13:51:11 +0000 (07:51 -0600)]
c/r: add an option to use faster inotify support in CRIU

The idea here is that criu can use open_by_handle on a configuration which
will preserve inodes on moves across hosts, but shouldn't do that on
configurations which won't preserve inodes. Before, we forced it to always
be slow, but we don't have to do this.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
8 years agoMerge pull request #1017 from tych0/increase-log-line-size
Stéphane Graber [Tue, 10 May 2016 22:51:18 +0000 (18:51 -0400)]
Merge pull request #1017 from tych0/increase-log-line-size

log: remove duplicate definitons and bump buffer size

8 years agoc/r: rearrange things to pass struct migrate_opts all the way down
Tycho Andersen [Fri, 6 May 2016 18:19:16 +0000 (18:19 +0000)]
c/r: rearrange things to pass struct migrate_opts all the way down

If we don't do this, we'll end up changing the function signatures for the
internal __criu_* functions each time we add a new parameter, which will
get very annoying very quickly. Since we already have the user's arguments
struct, let's just pass that all the way down.

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
8 years agolog: remove duplicate definitons and bump buffer size
Tycho Andersen [Mon, 9 May 2016 21:37:26 +0000 (21:37 +0000)]
log: remove duplicate definitons and bump buffer size

When writing out the CRIU exec command, we're bumping up against the buffer
size limit. Let's increase it so we can avoid:

lxc 20160509213229.921 WARN     lxc_log - log.c:log_append_logfile:111 - truncated next event from 523 to 512 bytes

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
8 years agoMerge pull request #1015 from stewartbrodie/confile-value-quotes
Serge Hallyn [Tue, 10 May 2016 19:16:56 +0000 (14:16 -0500)]
Merge pull request #1015 from stewartbrodie/confile-value-quotes

Allow configuration file values to be quoted

8 years agoAllow configuration file values to be quoted
Stewart Brodie [Tue, 10 May 2016 12:57:00 +0000 (13:57 +0100)]
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>
8 years agoMerge pull request #1014 from hallyn/2016-05-09/procnet
Christian Brauner [Mon, 9 May 2016 21:37:42 +0000 (23:37 +0200)]
Merge pull request #1014 from hallyn/2016-05-09/procnet

Unshare netns after setting the userns mappings

8 years agoUnshare netns after setting the userns mappings
Serge Hallyn [Mon, 9 May 2016 20:30:46 +0000 (15:30 -0500)]
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>
8 years agoMerge pull request #1013 from hartnellfoster/bugfix_20160509
Christian Brauner [Mon, 9 May 2016 11:51:20 +0000 (13:51 +0200)]
Merge pull request #1013 from hartnellfoster/bugfix_20160509

Added OR statement for cases of ID = rhel in RHEL 7+

8 years agoAdded OR statement for cases of ID = rhel in RHEL 7+
Hartnell Foster [Mon, 9 May 2016 11:42:56 +0000 (12:42 +0100)]
Added OR statement for cases of ID = rhel in RHEL 7+

Signed-off-by: Hartnell Foster <hartnell.foster@bbc.co.uk>
8 years agoMerge pull request #1008 from brauner/bugfix_branch
Serge Hallyn [Mon, 9 May 2016 03:54:20 +0000 (22:54 -0500)]
Merge pull request #1008 from brauner/bugfix_branch

sync.c: use correct types

8 years agosync.c: use correct types
Christian Brauner [Sat, 7 May 2016 05:40:33 +0000 (07:40 +0200)]
sync.c: use correct types

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
8 years agoMerge pull request #1010 from creideiki/fix-cap-sys-resource-typo
Christian Brauner [Sun, 8 May 2016 09:19:48 +0000 (11:19 +0200)]
Merge pull request #1010 from creideiki/fix-cap-sys-resource-typo

Change sys_resources to sys_resource.

8 years agoChange sys_resources to sys_resource.
Karl-Johan Karlsson [Sun, 8 May 2016 08:38:31 +0000 (10:38 +0200)]
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>
8 years agoMerge pull request #1005 from tych0/warn-about-unexpected-sync-size
Serge Hallyn [Fri, 6 May 2016 23:16:21 +0000 (18:16 -0500)]
Merge pull request #1005 from tych0/warn-about-unexpected-sync-size

sync: fail on unexpected message sizes

8 years agosync: fail on unexpected message sizes
Tycho Andersen [Fri, 6 May 2016 16:21:39 +0000 (11:21 -0500)]
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>
8 years agoMerge pull request #1004 from Lisio/alpine-hostname
Christian Brauner [Thu, 5 May 2016 20:51:21 +0000 (22:51 +0200)]
Merge pull request #1004 from Lisio/alpine-hostname

Force DHCP client to send hostname

8 years agoForce DHCP client to send hostname
Lisio [Thu, 5 May 2016 04:35:36 +0000 (08:35 +0400)]
Force DHCP client to send hostname

Required for proper applying dnsmasq config entries.

Signed-off-by: Andrey Kostin <andrey@kostin.email>
8 years agoMerge pull request #998 from thtanaka/network-config
Christian Brauner [Mon, 2 May 2016 21:14:46 +0000 (23:14 +0200)]
Merge pull request #998 from thtanaka/network-config

Improve on the case where default networking config is incomplete

8 years agoImprove on the case where default networking config is incomplete
Thomas Tanaka [Mon, 2 May 2016 18:30:30 +0000 (11:30 -0700)]
Improve on the case where default networking config is incomplete

Signed-off-by: Thomas Tanaka <thomas.tanaka@oracle.com>
8 years agoMerge pull request #997 from ysbnim/master
Christian Brauner [Mon, 2 May 2016 09:46:20 +0000 (11:46 +0200)]
Merge pull request #997 from ysbnim/master

Update Korean manuals

8 years agodoc: Add logging option to Korean lxc-attach(1)
Sungbae Yoo [Mon, 2 May 2016 09:25:29 +0000 (18:25 +0900)]
doc: Add logging option to Korean lxc-attach(1)

Update for commit f43d63b

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
8 years agoMerge pull request #995 from ar45/fix_system_error_init_container_failed
Christian Brauner [Sun, 1 May 2016 21:42:15 +0000 (23:42 +0200)]
Merge pull request #995 from ar45/fix_system_error_init_container_failed

set PyErr when Container.__init__ fails

8 years agoMerge pull request #996 from ar45/add_network_type_to_keys
Christian Brauner [Sun, 1 May 2016 18:38:57 +0000 (20:38 +0200)]
Merge pull request #996 from ar45/add_network_type_to_keys

Expose lxc.network.type through lxc_list_nicconfigs()

8 years agoAdded `type` to keys in lxc_list_nicconfigs
Aron Podrigal [Sun, 1 May 2016 16:13:39 +0000 (12:13 -0400)]
Added `type` to keys in lxc_list_nicconfigs

Signed-off-by: Aron Podrigal <aronp@guaranteedplus.com>
8 years agoFixed - set PyErr when Container.__init__ fails
Aron Podrigal [Sun, 1 May 2016 15:06:53 +0000 (11:06 -0400)]
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>
8 years agoMerge pull request #993 from walkerning/check-tty
Stéphane Graber [Sun, 1 May 2016 02:17:42 +0000 (04:17 +0200)]
Merge pull request #993 from walkerning/check-tty

Check if the stdout is a terminal in lxc-checkconfig

8 years agoCheck if stdout is a terminal in lxc-checkconfig
walkerning [Sat, 30 Apr 2016 17:06:29 +0000 (01:06 +0800)]
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>
8 years agoMerge pull request #991 from brauner/2016-04-28/less_syscall_for_lxc_ls
Serge Hallyn [Fri, 29 Apr 2016 18:26:26 +0000 (13:26 -0500)]
Merge pull request #991 from brauner/2016-04-28/less_syscall_for_lxc_ls

2016 04 28/less syscall for lxc ls

8 years agolxc-ls: non-functional changes
Christian Brauner [Thu, 28 Apr 2016 20:58:14 +0000 (22:58 +0200)]
lxc-ls: non-functional changes

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
8 years agolxc-ls: use fewer syscalls when doing ipc
Christian Brauner [Wed, 27 Apr 2016 12:27:51 +0000 (14:27 +0200)]
lxc-ls: use fewer syscalls when doing ipc

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
8 years agoMerge pull request #978 from evgeni/lsb-init-scripts
Stéphane Graber [Mon, 25 Apr 2016 13:55:49 +0000 (15:55 +0200)]
Merge pull request #978 from evgeni/lsb-init-scripts

don't make sysv init scripts dependant on distribution specifics

8 years agoMerge pull request #987 from tenforward/japanese
Christian Brauner [Mon, 25 Apr 2016 10:35:19 +0000 (12:35 +0200)]
Merge pull request #987 from tenforward/japanese

doc: Add logging option to Japanese lxc-attach(1)

8 years agodoc: Add logging option to Japanese lxc-attach(1)
KATOH Yasufumi [Mon, 25 Apr 2016 10:30:03 +0000 (19:30 +0900)]
doc: Add logging option to Japanese lxc-attach(1)

Update for commit f43d63b

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
8 years agoUpdate maintainers
Stéphane Graber [Sun, 24 Apr 2016 22:34:15 +0000 (18:34 -0400)]
Update maintainers

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
8 years agoInitialize a pointer in split_init_cmd() to avoid gcc warnings
Leonid Isaev [Thu, 21 Apr 2016 19:20:39 +0000 (13:20 -0600)]
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>
8 years agoMerge pull request #982 from brauner/2016-04-19/mimic_ssh
Serge Hallyn [Tue, 19 Apr 2016 18:27:16 +0000 (13:27 -0500)]
Merge pull request #982 from brauner/2016-04-19/mimic_ssh

use raw settings of ssh for pty

8 years agouse raw settings of ssh for pty
Christian Brauner [Tue, 19 Apr 2016 13:17:19 +0000 (15:17 +0200)]
use raw settings of ssh for pty

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
8 years agoMerge pull request #981 from LynxChaus/master
Christian Brauner [Mon, 18 Apr 2016 19:25:41 +0000 (21:25 +0200)]
Merge pull request #981 from LynxChaus/master

Switch console pty to raw mode.

8 years agoSwitch console pty to raw mode. Without this some ncurses-based programs behave incor...
Andrey Jr. Melnikov [Mon, 18 Apr 2016 16:16:08 +0000 (19:16 +0300)]
Switch console pty to raw mode. Without this some ncurses-based programs behave incorrectly

Signed-off-by: Andrey Jr. Melnikov <temnota.am@gmail.com>
8 years agodon't make sysv init scripts dependant on distribution specifics
Evgeni Golov [Fri, 15 Apr 2016 18:45:09 +0000 (20:45 +0200)]
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>
8 years agoMerge pull request #976 from evgeni/drop-syslog.target
Christian Brauner [Fri, 15 Apr 2016 11:11:29 +0000 (13:11 +0200)]
Merge pull request #976 from evgeni/drop-syslog.target

drop obsolete syslog.target from lxc.service.in

8 years agodrop obsolete syslog.target from lxc.service.in
Evgeni Golov [Thu, 14 Apr 2016 16:03:29 +0000 (18:03 +0200)]
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>
8 years agoMerge pull request #974 from ar45/lxc_python_create_with_tuple
Stéphane Graber [Thu, 14 Apr 2016 04:41:12 +0000 (00:41 -0400)]
Merge pull request #974 from ar45/lxc_python_create_with_tuple

Fixed python-lxc reference to var before assignment

8 years agoFixed python-lxc reference to var before assignment
Aron Podrigal [Thu, 14 Apr 2016 04:21:08 +0000 (00:21 -0400)]
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>
8 years agoMerge pull request #972 from evgeni/lsb-headers
Stéphane Graber [Wed, 13 Apr 2016 22:47:53 +0000 (18:47 -0400)]
Merge pull request #972 from evgeni/lsb-headers

add missing lsb headers to sysvinit scripts

8 years agoMerge pull request #973 from evgeni/debian-no-rootpw
Christian Brauner [Wed, 13 Apr 2016 22:32:56 +0000 (00:32 +0200)]
Merge pull request #973 from evgeni/debian-no-rootpw

do not set the root password in the debian template

8 years agodo not set the root password in the debian template
Evgeni Golov [Wed, 13 Apr 2016 16:04:19 +0000 (18:04 +0200)]
do not set the root password in the debian template

closes #302

Signed-off-by: Evgeni Golov <evgeni@debian.org>
8 years agoadd missing lsb headers to sysvinit scripts
Evgeni Golov [Wed, 13 Apr 2016 15:54:55 +0000 (17:54 +0200)]
add missing lsb headers to sysvinit scripts

original patch by Daniel Baumann

closes #308

Signed-off-by: Evgeni Golov <evgeni@debian.org>
8 years agoMerge pull request #970 from brauner/2016-04-13/lxc_attach_log
Serge Hallyn [Wed, 13 Apr 2016 15:19:03 +0000 (10:19 -0500)]
Merge pull request #970 from brauner/2016-04-13/lxc_attach_log

lxc-attach: error on -L/--pty-log + redirection

8 years agoonly execute last test when we are a pty
Christian Brauner [Wed, 13 Apr 2016 13:41:58 +0000 (15:41 +0200)]
only execute last test when we are a pty

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
8 years agoMerge pull request #971 from hallyn/2016-04-12/nosystemd
Christian Brauner [Wed, 13 Apr 2016 14:40:19 +0000 (16:40 +0200)]
Merge pull request #971 from hallyn/2016-04-12/nosystemd

cgfsng: don't require that systemd subsystem be mounted

8 years agolxc-attach: error on -L/--pty-log + redirection
Christian Brauner [Wed, 13 Apr 2016 13:23:35 +0000 (15:23 +0200)]
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>
8 years agoMerge pull request #966 from evgeni/SOURCE_DATE_EPOCH
Stéphane Graber [Tue, 12 Apr 2016 19:38:01 +0000 (15:38 -0400)]
Merge pull request #966 from evgeni/SOURCE_DATE_EPOCH

nicer date format and support for SOURCE_DATE_EPOCH in LXC_GENERATE_DATE

8 years agocgfsng: don't require that systemd subsystem be mounted
Serge Hallyn [Tue, 12 Apr 2016 17:34:28 +0000 (12:34 -0500)]
cgfsng: don't require that systemd subsystem be mounted

Note that is_crucial_subsystem still lists name=systemd.  That is
used in cgfs and cgmanager.  Cgmanager is typically setup to create
name=systemd, so it is ok.  cgfs uses is_crucial_subsystem() only
to decide whether failure to create or chown a directory should be
terminal.  That's ok, because (a) if name=systemd is not mounted then
we won't hit that, and (b) if name=systemd is mounted, then we'd
really still like to set it up for containers.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
8 years agonicer date format and support for SOURCE_DATE_EPOCH in LXC_GENERATE_DATE
Evgeni Golov [Tue, 12 Apr 2016 17:20:10 +0000 (19:20 +0200)]
nicer date format and support for SOURCE_DATE_EPOCH in LXC_GENERATE_DATE

Using $(date) for LXC_GENERATE_DATE has various flaws:
* formating depends on the locale of the system we execute configure on
* the output is not really a date but more a timestamp

Let's use $(date --utc '+%Y-%m-%d') instead.

While at it, also support SOURCE_DATE_EPOCH [1] to make the build
reproducible

[1] https://reproducible-builds.org/specs/source-date-epoch/

Signed-off-by: Evgeni Golov <evgeni@debian.org>
8 years agoMerge pull request #964 from brauner/2016-04-11/lxc_attach_manpage
Serge Hallyn [Tue, 12 Apr 2016 15:22:41 +0000 (10:22 -0500)]
Merge pull request #964 from brauner/2016-04-11/lxc_attach_manpage

lxc-attach: add logging option to manpage

8 years agoMerge pull request #965 from brauner/2016-04-12/lxc_destroy_avoid_double_print
Serge Hallyn [Mon, 11 Apr 2016 22:42:17 +0000 (17:42 -0500)]
Merge pull request #965 from brauner/2016-04-12/lxc_destroy_avoid_double_print

lxc-destroy: avoid double print

8 years agolxc-destroy: avoid double print
Christian Brauner [Mon, 11 Apr 2016 21:57:29 +0000 (23:57 +0200)]
lxc-destroy: avoid double print

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
8 years agoMerge pull request #962 from staticfox/gitignore
Serge Hallyn [Mon, 11 Apr 2016 20:10:07 +0000 (15:10 -0500)]
Merge pull request #962 from staticfox/gitignore

Ignore temporary files generated by doxygen

8 years agolxc-attach: add logging option to manpage
Christian Brauner [Mon, 11 Apr 2016 16:13:09 +0000 (18:13 +0200)]
lxc-attach: add logging option to manpage

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
8 years agoMerge pull request #963 from brauner/2016-04-11/lxc_create_best_storage
Serge Hallyn [Mon, 11 Apr 2016 15:28:54 +0000 (10:28 -0500)]
Merge pull request #963 from brauner/2016-04-11/lxc_create_best_storage

lxc-create: fix -B best option

8 years agoMerge pull request #961 from staticfox/iterations
Christian Brauner [Mon, 11 Apr 2016 15:25:32 +0000 (17:25 +0200)]
Merge pull request #961 from staticfox/iterations

Use size_t as an iteration point over int

8 years agolxc-create: fix -B best option
Christian Brauner [Mon, 11 Apr 2016 15:13:16 +0000 (17:13 +0200)]
lxc-create: fix -B best option

Signed-off-by: Christian Brauner <christian.brauner@mailbox.org>
8 years agoUse size_t as an iteration point over int
staticfox [Mon, 11 Apr 2016 14:36:37 +0000 (10:36 -0400)]
Use size_t as an iteration point over int

This cleans up some sign-compare warnings as well as avoids any
possibilities of unintended signed offsets for indices during
iteration.

Signed-off-by: Matt Ullman <staticfox@staticfox.net>
8 years agoIgnore temporary files generated by doxygen
staticfox [Mon, 11 Apr 2016 14:54:44 +0000 (10:54 -0400)]
Ignore temporary files generated by doxygen

Signed-off-by: Matt Ullman <staticfox@staticfox.net>
8 years agoMerge pull request #958 from brauner/2016-04-08/lxc_attach_simplify_and_log
Serge Hallyn [Sun, 10 Apr 2016 23:00:19 +0000 (18:00 -0500)]
Merge pull request #958 from brauner/2016-04-08/lxc_attach_simplify_and_log

adapt lxc-attach tests