Commit Graph

5717 Commits

Author SHA1 Message Date
KATOH Yasufumi
03c9e2d51b doc: fix regex-typo in Japanese and Korean lxc-monitor(1)
Update for commit e3dd06ef41

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-09-20 00:57:21 +09:00
Christian Brauner
364c5d97de Merge pull request #1817 from stgraber/master
Fix typo
2017-09-19 02:41:02 -06:00
Stéphane Graber
aedfcb8acb Merge pull request #1811 from runejuhl/fix-alpine-apk-keys
Change alpine template file check to also check file size (`-f` => `-s`)
2017-09-18 19:05:13 -04:00
Stéphane Graber
eee1a9d773
Fix typo
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2017-09-18 19:03:48 -04:00
Christian Brauner
6cc7d050ca Merge pull request #1816 from stgraber/master
tests: Support systemd hybrid cgroups
2017-09-18 16:30:54 -06:00
Stéphane Graber
8d5a91fc65
tests: Support systemd hybrid cgroups
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
2017-09-18 18:18:12 -04:00
Rune Juhl Jacobsen
fc20af631e
Change file check to also check file size (-f => -s)
Because the `fetch` wget wrapper outputs files to stdout we may end up in a
situation where wget fails but the files are still created. This can happen
e.g. when the host date is out of sync leading to a failed certificate
check, resulting in the creation of empty key files.

Once the empty files have been created the template will try to use them which
causes the certificate check to fail.

By using `-s` instead of `-f` the template will re-fetch the files unless they
exist AND have a size greater than zero.

Signed-off-by: Rune Juhl Jacobsen <runejuhl@petardo.dk>
2017-09-18 19:56:42 +02:00
Stéphane Graber
89dd4bff65 Merge pull request #1805 from tenforward/fix_plamo
plamo: Delete unnecessary process during container shutdown
2017-09-18 09:45:35 -07:00
Stéphane Graber
329414e0d1 Merge pull request #1810 from brauner/2017-09-12/start_move_env_setup
start: pass LXC_LOG_LEVEL to hooks
2017-09-18 09:45:17 -07:00
Christian Brauner
8bd8018e3d
utils: fix lxc_popen()/lxc_pclose()
- rework and fix pipe fd leak

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-13 17:07:43 +02:00
Christian Brauner
3f32320757
utils: duplicate stderr as well in lxc_popen()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-13 05:26:39 +02:00
Christian Brauner
b68c6a71d4
doc: document missing env variables
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-13 05:05:36 +02:00
Christian Brauner
b8f88d9bb2
start: pass LXC_LOG_LEVEL to hooks
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-13 05:05:36 +02:00
Stéphane Graber
dbac6c0256 Merge pull request #1809 from brauner/2017-09-12/start_move_env_setup
start: set environment variables correctly
2017-09-12 19:14:27 -07:00
Christian Brauner
149857af10
start: set environment variables correctly
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-13 04:01:41 +02:00
Stéphane Graber
03afa514d0 Merge pull request #1807 from brauner/2017-09-12/start_move_env_setup
start: move env setup before container setup
2017-09-12 17:11:13 -07:00
Christian Brauner
98ff08ca8d
start: move env setup before container setup
The hooks (e.g. lxc.hook.mount) should have the environment variables the user
gave us available.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-13 01:47:59 +02:00
Christian Brauner
52109c4bac Merge pull request #1806 from roques/patch-1
[TRIVIAL] fix regex-typo in documentation example
2017-09-12 10:15:18 -07:00
Christian von Roques
e3dd06ef41 fix regex-typo in lxc-monitor.sgml.in
To match names beginning with the letters "f" or "b" one can use
the regular expression "[fb].*" or "(f|b).*", but not "[f|b].*",
which would match strings beginning with "f", "|", or "b".

Signed-off-by: Christian von Roques <roques@z12.ch>
2017-09-12 18:37:06 +02:00
KATOH Yasufumi
d3953cdca9 plamo: Delete unnecessary process during container shutdown
Since some remounts/umounts is executed in the plamo shutdown script,
the filesystem on where a container exists might be mount as
read-only. This patch delete some mounts and umounts from the shutdown
script. It also delete hwclock setting process.

And delete an unncecessary output.

Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
2017-09-12 16:03:31 +09:00
Serge Hallyn
2569f6f6f5 Merge pull request #1803 from brauner/2017-09-10/lxc_execute_switch_ids_last
start: switch ids at last possible instance
2017-09-11 13:27:58 -07:00
Christian Brauner
45b4bb9618
storage: avoid segfault
When the "lxc.rootfs.path" property is not set and users request a container
copy we would segfault since strstr() would be called on a NULL pointer.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-11 08:45:54 +02:00
Christian Brauner
76bdf2992c
start: switch ids at last possible instance
This is technically not necessary but it is a privilege sensitive operation.
Meaning if anyone wants to do something that requires privilege it should be
done before the id switch. So let's move the id switch immediately before the
exec so that it's called at the last possible moment.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-11 08:44:06 +02:00
Serge Hallyn
42f055d0f6 Merge pull request #1801 from brauner/2017-09-09/userns_exec
conf: add userns_exec_full()
2017-09-10 18:42:54 -05:00
Christian Brauner
ed8704d040
execute: enable console & standard /dev symlinks
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-10 23:51:58 +02:00
Christian Brauner
3b13691dca
confile: preserve newlines
Users were confused when the config file created during cloning or copying a
container suddenly missed all newlines. Let's keep them.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-10 23:51:58 +02:00
Christian Brauner
5fe9c0a0e6
network: remove dead assignments
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-10 23:51:57 +02:00
Christian Brauner
cef588fcf0
lxc-user-nic: remove double initialization
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-10 23:51:57 +02:00
Christian Brauner
2468599d8e
utils: lxc_popen() remove dead assignments
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-10 23:51:57 +02:00
Christian Brauner
ad0b79f057
tests: avoid NULL pointer dereference
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-10 23:51:57 +02:00
Christian Brauner
258611dd5a
tests: remove dead assignments
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-10 23:51:57 +02:00
Christian Brauner
1285f7d59a
lxc_usernsexec: remove dead assignments
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-10 23:51:52 +02:00
Christian Brauner
40625b63a4
lxc-unshare: do not pass NULL pointer
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-10 23:49:31 +02:00
Christian Brauner
ab9e3ff33d
confile: parse_idmaps() remove dead assignments
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-10 23:49:31 +02:00
Christian Brauner
e10e9f59ac
overlay: fix use after free()
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-10 23:49:31 +02:00
Christian Brauner
7a643c7c02
utils: do not write to 0 sized buffer
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-10 23:49:31 +02:00
Christian Brauner
180c477a32
storage/overlay: do not write to invalid memory
Closes #1802.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-10 19:35:32 +02:00
Christian Brauner
42277b1ca1
criu: use correct check initialization check
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-09 18:45:47 +02:00
Christian Brauner
9e2bdae4a6
start: remove dead variable
non-functional changes

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-09 11:23:55 +02:00
Christian Brauner
4dd08ac85f
monitor: remove dead assignment
non-functional changes

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-09 11:23:34 +02:00
Christian Brauner
a05a723f6a
console: remove dead assignments
non-functional changes

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-09 11:23:14 +02:00
Christian Brauner
5c05427a60
storage: use userns_exec_full()
Closes #1800.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-09 11:22:44 +02:00
Christian Brauner
94b0a3ac39
start: userns_exec_full()
Closes #1800.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-09 11:21:51 +02:00
Christian Brauner
ee484f7f68
lxccontainer: use userns_exec_full()
Closes #1800.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-09 11:21:16 +02:00
Christian Brauner
415a885148
conf: add userns_exec_full()
Closes #1800.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-09 11:20:57 +02:00
Stéphane Graber
1787265134 Merge pull request #1794 from brauner/2017-09-06/fix_config_update_script
tools: fix lxc-upate-config
2017-09-06 14:41:25 -04:00
Christian Brauner
64dec99fe1
tools: fix lxc-upate-config
- replace lxc.network.[i].ipv4 with lxc.net.[i].ipv4.address
- remove lxc.rootfs.backend lines

Closes #1790.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
2017-09-06 20:27:23 +02:00
Christian Brauner
a00b86ac4a Merge pull request #1793 from tenforward/japanese
Update Japanese man pages
2017-09-06 12:48:25 +02:00
Christian Brauner
dc647c5803 Merge pull request #1791 from Blub/unnamed-vs-ovs-bridge
network: add missing checks for empty links
2017-09-06 12:47:57 +02:00
Christian Brauner
e8f614f2d9 Merge pull request #1792 from Blub/cleanups
cleanup: remove unnecessary zeroing
2017-09-06 12:17:21 +02:00