]>
git.proxmox.com Git - mirror_lxc.git/log
Christian Brauner [Fri, 12 Jan 2018 13:46:46 +0000 (14:46 +0100)]
tools: move lxc-device to API symbols only
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 13:39:21 +0000 (14:39 +0100)]
tools: move lxc-destroy to API symbols only
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 13:33:06 +0000 (14:33 +0100)]
tools: move lxc-create to API symbols only
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 13:27:23 +0000 (14:27 +0100)]
tools: move lxc-copy to API symbols only
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 13:11:21 +0000 (14:11 +0100)]
cmd: move lxc-console to API symbols only
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 13:08:43 +0000 (14:08 +0100)]
cmd: move lxc-config to API symbols only
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 13:05:21 +0000 (14:05 +0100)]
tools: move lxc-clone to API symbols only
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 13:02:10 +0000 (14:02 +0100)]
tools: move lxc-checkpoint to API symbols only
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 12:56:37 +0000 (13:56 +0100)]
cmd: move lxc-update-config
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 12:54:30 +0000 (13:54 +0100)]
cmd: move lxc-monitord
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 12:53:10 +0000 (13:53 +0100)]
cmd: move lxc-user-nic
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 12:49:55 +0000 (13:49 +0100)]
cmd: move lxc-checkconfig
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 12:48:07 +0000 (13:48 +0100)]
cmd: move init.lxc{.static}
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 12:46:30 +0000 (13:46 +0100)]
cmd: move lxc-lxc_usernsexec
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 12:36:12 +0000 (13:36 +0100)]
tools: move lxc-cgroup to API symbols only
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 12:32:04 +0000 (13:32 +0100)]
tools: move lxc-autostart to API symbols only
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 12:25:15 +0000 (13:25 +0100)]
tools: lxc-autostart: non-functional changes
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Fri, 12 Jan 2018 12:13:09 +0000 (13:13 +0100)]
tools: move lxc-attach to API symbols only
Closes #2073.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Serge Hallyn [Tue, 6 Feb 2018 19:19:10 +0000 (13:19 -0600)]
Merge pull request #2117 from brauner/2018-01-26/cgroup_v2_support
cgroups: add unified hierarchy support
Serge Hallyn [Tue, 6 Feb 2018 19:08:49 +0000 (13:08 -0600)]
Merge pull request #2044 from brauner/2017-12-16/lxc_ls_add_unprivileged_field
tools: add UNPRIVILEGED field in fancy output mode
Serge Hallyn [Mon, 5 Feb 2018 15:00:27 +0000 (09:00 -0600)]
Merge pull request #2130 from tych0/sigterm-handling
Sigterm handling
Christian Brauner [Mon, 5 Feb 2018 14:47:07 +0000 (15:47 +0100)]
Merge pull request #2129 from tych0/sigterm-sigkill
lxc-init: use SIGKILL after alarm timeout
Tycho Andersen [Mon, 5 Feb 2018 14:19:25 +0000 (14:19 +0000)]
lxc.init: ignore SIGHUP
see comment for details.
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Tycho Andersen [Mon, 5 Feb 2018 14:17:48 +0000 (14:17 +0000)]
monitor: send SIGTERM to the container when SIGHUP is received
For the ->execute() case, we want to make sure the application dies when
SIGHUP is received. The next patch will ignore SIGHUP in the lxc monitor,
because tasks inside the container send SIGHUP to init to have it reload
its config sometimes, and we don't want to do that with init.lxc, since it
might actually kill the container if it forwards SIGHUP to the child and
the child can't handle it.
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Tycho Andersen [Mon, 5 Feb 2018 14:13:18 +0000 (14:13 +0000)]
lxc-init: use SIGKILL after alarm timeout
d76e3e1 inadvertently switched the alarm timeout from sigterm to sigkill.
We really want sigkill here, so let's bring it back.
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Christian Brauner [Fri, 2 Feb 2018 15:11:50 +0000 (16:11 +0100)]
Merge pull request #2126 from flx42/nvidia-visible-devices-change-null-semantic
hooks: change the semantic of NVIDIA_VISIBLE_DEVICES=""
Felix Abecassis [Fri, 2 Feb 2018 14:19:13 +0000 (06:19 -0800)]
hooks: change the semantic of NVIDIA_VISIBLE_DEVICES=""
With LXC, you can override the value of an environment variable to
null, but you can't unset an existing variable.
The NVIDIA hook was previously activated when NVIDIA_VISIBLE_DEVICES
was set to null. As a result, it was not possible to disable the hook
by overriding the environment variable in the configuration.
The hook can now be disabled by setting NVIDIA_VISIBLE_DEVICES to
null or to the new special value "void".
Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
Christian Brauner [Thu, 1 Feb 2018 14:55:25 +0000 (15:55 +0100)]
Merge pull request #2120 from stgraber/master
debian: We must use iproute on wheezy
Stéphane Graber [Thu, 1 Feb 2018 14:02:25 +0000 (15:02 +0100)]
debian: We must use iproute on wheezy
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Thu, 1 Feb 2018 14:26:22 +0000 (15:26 +0100)]
Merge pull request #2119 from brauner/2018-02-01/fix_android
lsm: do not #ifdefine
Christian Brauner [Thu, 1 Feb 2018 12:14:36 +0000 (13:14 +0100)]
lsm: do not #ifdefine
Since we stopped linking against AppArmor we can now remove the conditional
compilation.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Serge Hallyn [Thu, 1 Feb 2018 04:11:48 +0000 (22:11 -0600)]
Merge pull request #2114 from brauner/2018-01-27/make_name_arg_optional
tools: make "-n" optional
Christian Brauner [Wed, 31 Jan 2018 16:09:13 +0000 (17:09 +0100)]
cgroups: more consistent naming
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 31 Jan 2018 15:45:04 +0000 (16:45 +0100)]
cgroups: handle limits on the unified hierarchy
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 31 Jan 2018 15:44:30 +0000 (16:44 +0100)]
confile: add lxc.cgroup2.[controller].[property]
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 31 Jan 2018 15:42:19 +0000 (16:42 +0100)]
cgroups: cgfsng_set: handle unified hierarchy
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 31 Jan 2018 15:41:53 +0000 (16:41 +0100)]
cgroups: cgfsng_get: handle unified hierarchy
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 31 Jan 2018 15:38:55 +0000 (16:38 +0100)]
cgroups: cgfsng_attach: handle unified hierarchy
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 31 Jan 2018 15:33:17 +0000 (16:33 +0100)]
cgroups: cgfsng_create: handle unified hierarchy
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 31 Jan 2018 15:25:11 +0000 (16:25 +0100)]
cgroups: get controllers on the unified hierarchy
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Stéphane Graber [Tue, 30 Jan 2018 01:06:50 +0000 (20:06 -0500)]
Merge pull request #2116 from brauner/2018-01-29/legacy_network_fixes
confile_legacy: fix legacy network parser
Christian Brauner [Mon, 29 Jan 2018 21:01:20 +0000 (22:01 +0100)]
confile_legacy: fix legacy network parser
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Serge Hallyn [Mon, 29 Jan 2018 23:08:38 +0000 (17:08 -0600)]
Merge pull request #2102 from brauner/2018-01-22/lsm_simplifications
lsm: simplifcations
Christian Brauner [Sat, 27 Jan 2018 13:43:14 +0000 (14:43 +0100)]
tools: make "-n" optional
This lets users use the tools with "lxc-* -n <container-name>" or
"lxc-* <container-name>".
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 27 Jan 2018 14:50:13 +0000 (15:50 +0100)]
Merge pull request #2113 from marcosps/seccomp_return
seccomp.c: Use return instead of attribution and return
Marcos Paulo de Souza [Sat, 27 Jan 2018 13:13:20 +0000 (11:13 -0200)]
seccomp.c: Use return instead of attribution and return
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Christian Brauner [Sat, 27 Jan 2018 11:31:50 +0000 (12:31 +0100)]
Merge pull request #2112 from stgraber/master
debian: Use iproute2 instead of iproute
Stéphane Graber [Sat, 27 Jan 2018 05:33:07 +0000 (00:33 -0500)]
debian: Use iproute2 instead of iproute
The package has pretty much always been iproute2 with iproute being an
alias for it, the alias is now gone so we need to use iproute2.
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Christian Brauner [Fri, 26 Jan 2018 22:39:29 +0000 (23:39 +0100)]
Merge pull request #2111 from tych0/unpriv-fixups
Unpriv fixups
Tycho Andersen [Fri, 26 Jan 2018 22:11:09 +0000 (22:11 +0000)]
rename am_unpriv to am_host_unpriv
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Tycho Andersen [Fri, 26 Jan 2018 21:21:51 +0000 (21:21 +0000)]
better unprivileged detection
In particular, if we are already in a user namespace we are unprivileged,
and doing things like moving the physical nics back to the host netns won't
work. Let's do the same thing LXD does if euid == 0: inspect
/proc/self/uid_map and see what that says.
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Tycho Andersen [Fri, 26 Jan 2018 17:43:12 +0000 (17:43 +0000)]
better check for lock dir
Consider the case where we're running in a user namespace but in the host's
mount ns with the host's filesystem (something like
lxc-usernsexec ... lxc-execute ...), in this case, we'll be euid 0, but we
can't actually write to /run. Let's improve this locking check to make sure
we can actually write to /run before we decide to actually use it as our
locking dir.
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Christian Brauner [Fri, 26 Jan 2018 13:54:35 +0000 (14:54 +0100)]
Merge pull request #2109 from duguhaotian/new
[cgfsng] show wrong errno
duguhaotian [Fri, 26 Jan 2018 13:07:58 +0000 (21:07 +0800)]
[cgfsng] show wrong errno
lxc_cgroup_set_data: h = get_hierarchy(controller);
if h is NULL, now errno is old, it donot set new one.
And then,
cgfsng_setup_limits:
if (lxc_cgroup_set_data(cg->subsystem, cg->value, d)) {
if (do_devices && (errno == EACCES ||
errno == EPERM)) {
WARN("Error setting %s to %s for %s",
cg->subsystem, cg->value,
d->name);
continue;
}
SYSERROR("Error setting %s to %s for
%s",
cg->subsystem, cg->value,
d->name);
goto out;
}
SYSERROR will show old errno, make me confused.
Signed-off-by: duguhaotian <duguhaotian@gmail.com>
Stéphane Graber [Wed, 24 Jan 2018 20:24:46 +0000 (22:24 +0200)]
Merge pull request #2099 from brauner/2018-01-20/attach_init_pty
bugfixes
Christian Brauner [Tue, 23 Jan 2018 10:31:53 +0000 (11:31 +0100)]
Merge pull request #2103 from marcosps/forward_not_used
network.c: Remove ip_forward_set and callers
Marcos Paulo de Souza [Tue, 23 Jan 2018 00:04:03 +0000 (22:04 -0200)]
network.c: Remove ip_forward_set and callers
The last user of ip_forward_set, lxc_ip_forward_on and
lxc_ip_forward_off was in 2009:
commit
92d385229be040cf034ac6efd9405b7bdfe06a3e
Author: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Thu Oct 22 15:33:40 2009 +0200
remove test directory
These functions are not called anymore.
Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
Christian Brauner [Mon, 22 Jan 2018 11:14:21 +0000 (12:14 +0100)]
autotools: do not link against libapparmor
Since we write the label directly without going through the AppArmor API it
doesn't make sense to link against it.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 22 Jan 2018 11:02:44 +0000 (12:02 +0100)]
apparmor: do not call aa_change_profile()
We can simply write the label ourselves. There's no magic happening.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 22 Jan 2018 10:54:21 +0000 (11:54 +0100)]
lsm: add lsm_process_label_set_at()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 22 Jan 2018 09:54:38 +0000 (10:54 +0100)]
lsm: add lsm_process_label_fd_get()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 22 Jan 2018 09:48:56 +0000 (10:48 +0100)]
lsm: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 22 Jan 2018 09:40:15 +0000 (10:40 +0100)]
Merge pull request #2092 from lifeng68/modify_console_create
Create console when the rootfs is NULL
LiFeng [Mon, 22 Jan 2018 11:13:52 +0000 (06:13 -0500)]
Fix comments and add check in lxc_poll.
Add check whether handler->conf->console.path is 'none'
Signed-off-by: LiFeng <lifeng68@huawei.com>
Christian Brauner [Mon, 22 Jan 2018 09:14:13 +0000 (10:14 +0100)]
Merge pull request #2100 from lifeng68/Modify_git_ignore
Modify .gitignore
LiFeng [Mon, 22 Jan 2018 12:48:21 +0000 (07:48 -0500)]
Modify .gitignore
Add:
src/tests/lxc-test-api-reboot
src/tests/lxc-test-criu-check-feature
src/tests/lxc-test-raw-clone
src/tests/lxc-test-share-ns
src/tests/lxc-test-state-server
Signed-off-by: LiFeng <lifeng68@huawei.com>
Christian Brauner [Mon, 22 Jan 2018 09:13:55 +0000 (10:13 +0100)]
Merge pull request #2101 from tenforward/japanese
doc: Update Japanese lxc-attach(1) and lxc.container.conf(5)
KATOH Yasufumi [Mon, 22 Jan 2018 05:47:48 +0000 (14:47 +0900)]
doc: Update Japanese lxc-attach(1) and lxc.container.conf(5)
* Update for commit
ba2be1a (attach: move pty allocation into api)
* Update for commit
5757588 (manpage: correct lxc.log.file conf option)
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Christian Brauner [Sun, 21 Jan 2018 14:23:20 +0000 (15:23 +0100)]
attach: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 21 Jan 2018 14:20:19 +0000 (15:20 +0100)]
attach: setup /proc limits
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sun, 21 Jan 2018 12:55:42 +0000 (13:55 +0100)]
start: fix mainloop cleanup goto statements
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 20 Jan 2018 20:46:31 +0000 (21:46 +0100)]
coverity: #
1426694
remove logically dead code
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 20 Jan 2018 20:44:50 +0000 (21:44 +0100)]
coverity: #
1426734
do not call close on bad fd
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 8 Jan 2018 17:25:56 +0000 (18:25 +0100)]
coverity: #
1427190
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Mon, 8 Jan 2018 17:24:41 +0000 (18:24 +0100)]
coverity: #
1427191
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 20 Jan 2018 20:35:35 +0000 (21:35 +0100)]
coverity: #
1427638
avoid (however unlikely) double free
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 20 Jan 2018 20:30:17 +0000 (21:30 +0100)]
coverity: #
1427639
remove logically dead code
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 20 Jan 2018 20:26:33 +0000 (21:26 +0100)]
coverity: #
1427668
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 20 Jan 2018 13:05:01 +0000 (14:05 +0100)]
tools: fix android
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 20 Jan 2018 13:04:15 +0000 (14:04 +0100)]
tools: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 20 Jan 2018 11:57:12 +0000 (12:57 +0100)]
attach: init struct
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Sat, 20 Jan 2018 05:27:36 +0000 (06:27 +0100)]
Merge pull request #2097 from mikemccracken/2018-01-19/report-storage-destroy
storage: treat return value from ops->destroy as int
Christian Brauner [Fri, 19 Jan 2018 23:42:16 +0000 (00:42 +0100)]
Merge pull request #2096 from mikemccracken/patch-1
manpage: correct lxc.log.file conf option
Christian Brauner [Fri, 19 Jan 2018 17:49:21 +0000 (18:49 +0100)]
Merge pull request #2095 from tych0/remove-lxc-init
unlink lxc-init
Michael McCracken [Fri, 19 Jan 2018 16:38:36 +0000 (08:38 -0800)]
storage: treat return value from ops->destroy as int
r->ops->destroy() returns an int, -1 on error.
When assigned to a bool, this becomes true and hides errors.
Signed-off-by: Michael McCracken <mikmccra@cisco.com>
Tycho Andersen [Wed, 20 Dec 2017 17:52:38 +0000 (17:52 +0000)]
unlink lxc-init
It's sort of an implementation detail that this exists at all, and we
should probably not pollute the container's mount tables or FS with this.
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
LiFeng [Fri, 19 Jan 2018 16:23:35 +0000 (11:23 -0500)]
Adapt lxc_setup_console() to bind mount 'console'
Signed-off-by: LiFeng <lifeng68@huawei.com>
Michael McCracken [Fri, 19 Jan 2018 19:05:26 +0000 (11:05 -0800)]
manpage: correct lxc.log.file conf option
lxc.log.file instead of just lxc.log
Signed-off-by: Michael McCracken <mikmccra@cisco.com>
Serge Hallyn [Fri, 19 Jan 2018 04:26:32 +0000 (22:26 -0600)]
Merge pull request #2094 from tych0/propagate-exit-code
Propagate exit code for app containers
Tycho Andersen [Fri, 19 Jan 2018 04:23:48 +0000 (04:23 +0000)]
set exit status to 1 in the unknown si_code case
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Tycho Andersen [Fri, 19 Jan 2018 03:31:33 +0000 (03:31 +0000)]
lxc-execute: actually exit with the status of the spawned task
Now that we have things propagated through init and liblxc correctly, at
least in non-daemon mode, we can exit with the actual exit status of the
task, instead of always succeeding, which is not so helpful.
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Tycho Andersen [Fri, 19 Jan 2018 03:29:05 +0000 (03:29 +0000)]
start: don't return false when the container's init exits nonzero
This seems slightly counter-intuitive, but IMO it's what we want.
Basically, ->start() should succeed if the container is spawned correctly
(similar to how golang's exec.Cmd.Start() returns nil if the thing spawns
correctly), and users can check error_num (i.e. golang's exec.Cmd.Wait())
to see how it exited.
This preserves previous behavior, which basically was that start was always
successful if the thing actually launched. Since we never kept track of
exit codes, this would always succeed too. Now that we do, it doesn't, and
this change is required.
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Tycho Andersen [Fri, 19 Jan 2018 03:24:59 +0000 (03:24 +0000)]
remember the exit code from the init process
error_num seems to be trying to remember the exit code of the init process,
except that nothing actually keeps track of it anywhere. So, let's add a
field to the handler, so that we can keep track of the process' exit
status, and the propagate it to error_num in struct lxc_container so that
people can use it.
Note that this is a slight behavior change, essentially instead of making
error_num always == the return code from start, now it contains slightly
more useful information (the actual exit status). But, there is only one
internal user of error_num which I'll fix in later in the series, so IMO
this is ok.
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Tycho Andersen [Fri, 19 Jan 2018 03:21:10 +0000 (03:21 +0000)]
lxc.init: correctly exit with the app's error code
Based on the comments in the code (and the have_status flag), the intent
here (and IMO, the desired behavior) should be for init.lxc to propagate
the actual exit code from the real application process up through.
Otherwise, it is swallowed and nobody can access it.
The bug being fixed here is that ret held the correct exit code, but when
it went around the loop again (to wait for other children) ret is
clobbered. Let's save the desired exit status somewhere else, so it can't
get clobbered, and we propagate things correctly.
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Tycho Andersen [Fri, 19 Jan 2018 03:20:08 +0000 (03:20 +0000)]
fix lxc_error_set_and_log to match the docs
The documentation for this function says if the task was killed by a
signal, the return code will be 128+n, where n is the signal number. Let's
make that actually true.
(We'll use this behavior in later patches.)
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Tycho Andersen [Fri, 19 Jan 2018 00:50:39 +0000 (00:50 +0000)]
start: don't log stop/continue for non-init processes
This non-init forwarding check should really be before all the log messages
about "init continued" or "init stopped", since they will otherwise lie
about some process that wasn't init being stopped or continued.
Signed-off-by: Tycho Andersen <tycho@tycho.ws>
LiFeng [Thu, 18 Jan 2018 22:26:11 +0000 (17:26 -0500)]
Create console when the rootfs is NULL
Signed-off-by: LiFeng <lifeng68@huawei.com>
Serge Hallyn [Wed, 17 Jan 2018 23:44:24 +0000 (17:44 -0600)]
Merge pull request #2089 from brauner/2018-01-17/restore_blocking_wait
lxccontainer: restore blocking wait()
Christian Brauner [Wed, 17 Jan 2018 19:46:04 +0000 (20:46 +0100)]
commands: add LXC_CMD_SERVE_STATE_CLIENTS
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Christian Brauner [Wed, 17 Jan 2018 19:09:13 +0000 (20:09 +0100)]
freezer: non-functional changes
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>