]>
git.proxmox.com Git - mirror_lxc.git/log
Elan Ruusamäe [Sat, 20 Aug 2016 14:09:28 +0000 (17:09 +0300)]
templates: use fd 9 instead of 200
to catch up mksh changes from
17abf27
Signed-off-by: Elan Ruusamäe <glen@delfi.ee>
Stéphane Graber [Fri, 19 Aug 2016 20:05:14 +0000 (16:05 -0400)]
Merge pull request #1144 from brauner/2016-08-19/seccomp_non_functional_changes
seccomp: non functional changes
Christian Brauner [Fri, 19 Aug 2016 16:53:02 +0000 (18:53 +0200)]
seccomp: non functional changes
- log more errnos
- adapt coding style
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Stéphane Graber [Fri, 19 Aug 2016 15:58:04 +0000 (11:58 -0400)]
Merge pull request #1141 from brauner/2016-08-19/add_missing_arches
confile: add more archs to lxc_config_parse_arch()
Stéphane Graber [Fri, 19 Aug 2016 15:57:28 +0000 (11:57 -0400)]
Merge pull request #1142 from brauner/2016-08-19/add_s390x_seccomp_support
seccomp: add support for s390x
Christian Brauner [Fri, 19 Aug 2016 13:20:22 +0000 (15:20 +0200)]
seccomp: remove double include and order includes
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Christian Brauner [Fri, 19 Aug 2016 09:57:14 +0000 (11:57 +0200)]
seccomp: add support for s390x
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Christian Brauner [Fri, 19 Aug 2016 09:15:30 +0000 (11:15 +0200)]
confile: add more archs to lxc_config_parse_arch()
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Christian Brauner [Thu, 18 Aug 2016 16:49:54 +0000 (18:49 +0200)]
Merge pull request #1133 from jcowgill/mips
Add MIPS support
James Cowgill [Thu, 18 Aug 2016 15:48:24 +0000 (16:48 +0100)]
seccomp: fix strerror()
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
James Cowgill [Thu, 18 Aug 2016 13:27:35 +0000 (14:27 +0100)]
seccomp: Add mips and mips64 entries to lxc_config_parse_arch
Fixes "unsupported personality" warnings when starting containers.
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
James Cowgill [Mon, 15 Aug 2016 16:10:00 +0000 (16:10 +0000)]
templates: Add mips hostarch detection to debian
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
James Cowgill [Mon, 15 Aug 2016 16:09:44 +0000 (16:09 +0000)]
seccomp: Implement MIPS seccomp handling
MIPS processors implement 3 ABIs: o32, n64 and n32 (similar to x32). The kernel
treats each ABI separately so syscalls disallowed on "all" arches should be
added to all three seccomp sets. This is implemented by expanding compat_arch
and compat_ctx to accept two compat architectures.
After this, the MIPS hostarch detection code and config section code is added.
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
James Cowgill [Fri, 12 Aug 2016 15:54:14 +0000 (15:54 +0000)]
utils: Add mips signalfd syscall numbers
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Christian Brauner [Thu, 18 Aug 2016 08:55:18 +0000 (10:55 +0200)]
Merge pull request #1140 from ysbnim/master
Update korean manuals
Sungbae Yoo [Thu, 18 Aug 2016 08:09:00 +0000 (17:09 +0900)]
doc: Add --rcfile to Japanese common opts
Update for commit
71d74a8
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Sungbae Yoo [Thu, 18 Aug 2016 07:49:26 +0000 (16:49 +0900)]
doc: Add --rcfile to Korean common opts
Update for commit
71d74a8
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Sungbae Yoo [Thu, 18 Aug 2016 07:36:24 +0000 (16:36 +0900)]
doc: Update Korean lxc-attach(1)
* Update for commit
03b0398
* Fix mistranslation words
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Christian Brauner [Wed, 17 Aug 2016 19:49:30 +0000 (21:49 +0200)]
Merge pull request #1138 from stgraber/master
Use full GPG fingerprint instead of long IDs.
Stéphane Graber [Wed, 17 Aug 2016 19:42:34 +0000 (15:42 -0400)]
Use full GPG fingerprint instead of long IDs.
With how easy it is to create a collision on a short ID nowadays and
given that the user doesn't actually have to remember or manually enter
the key ID, lets just use the full fingerprint from now on.
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Christian Brauner [Wed, 17 Aug 2016 15:27:16 +0000 (17:27 +0200)]
Merge pull request #1122 from Blub/rcfile-as-common-arg
Rcfile as common arg
Wolfgang Bumiller [Fri, 12 Aug 2016 10:33:44 +0000 (12:33 +0200)]
cleanup: replace tabs wth spaces in usage strings
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Wolfgang Bumiller [Fri, 12 Aug 2016 10:33:10 +0000 (12:33 +0200)]
cleanup: whitespaces in option alignment for lxc-execute
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Wolfgang Bumiller [Fri, 12 Aug 2016 10:28:16 +0000 (12:28 +0200)]
cleanup: tools: remove --name from lxc-top usage message
It doesn't have any effect on what lxc-top does and is only
accepted on account of being part of the common option list.
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Wolfgang Bumiller [Fri, 12 Aug 2016 12:55:42 +0000 (14:55 +0200)]
doc: add --rcfile to common opts
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Wolfgang Bumiller [Fri, 12 Aug 2016 12:49:37 +0000 (14:49 +0200)]
tools: set configfile after load_config
In order to cause c->is_defined() to become true.
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Wolfgang Bumiller [Fri, 12 Aug 2016 10:21:22 +0000 (12:21 +0200)]
tools: move --rcfile to the common options list
In almost all commands it's a useful addition to the -n
switch which is a common option, too.
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Stéphane Graber [Tue, 16 Aug 2016 20:56:43 +0000 (22:56 +0200)]
Merge pull request #1134 from brauner/2016-08-16/load_correct_ovl_module
bdev: use correct overlay module name
Christian Brauner [Tue, 16 Aug 2016 18:00:35 +0000 (20:00 +0200)]
bdev: use correct overlay module name
- Assume that the module name is "overlay" per default and not "overlayfs".
- Assume that the overlay version we are using requires a workdir.
- When we mount an overlay filesystem and we fail with ENODEV retry once with
the module name we haven't already used.
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Serge Hallyn [Tue, 16 Aug 2016 02:44:29 +0000 (21:44 -0500)]
Merge pull request #1132 from stgraber/master
Update gitignore
Stéphane Graber [Tue, 16 Aug 2016 02:42:45 +0000 (22:42 -0400)]
Add lxc-test-utils to .gitignore
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Tue, 16 Aug 2016 02:42:21 +0000 (22:42 -0400)]
Fix .gitignore after /tools/ split
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Stéphane Graber [Tue, 16 Aug 2016 00:04:19 +0000 (02:04 +0200)]
Merge pull request #1131 from brauner/2016-08-16/fix_make_dist
autotools: fix tests
Christian Brauner [Mon, 15 Aug 2016 23:42:38 +0000 (01:42 +0200)]
autotools: fix tests
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Serge Hallyn [Mon, 15 Aug 2016 17:36:44 +0000 (12:36 -0500)]
Merge pull request #1129 from brauner/2016-08-13/minimal_unit_testing
[RFC] add minimal unit testing for liblxc functions
Christian Brauner [Sun, 14 Aug 2016 20:42:17 +0000 (22:42 +0200)]
tests: add unit tests for lxc_string_in_array()
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Christian Brauner [Sat, 13 Aug 2016 20:38:52 +0000 (22:38 +0200)]
tests: add unit tests for lxc_string_replace()
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Stéphane Graber [Sun, 14 Aug 2016 21:03:25 +0000 (23:03 +0200)]
Merge pull request #1128 from brauner/2016-08-14/fix_text_file_busy
tools: use fclose() after fdopen() + add newline
Christian Brauner [Sat, 13 Aug 2016 23:01:04 +0000 (01:01 +0200)]
tools: use fclose() after fdopen() + add newline
So far we accidently used close() on the original file descriptor. (After
fdopen() the original fd is considered private and should not be used anymore.
The close operations should be performed on the new file handle. We did the
correct thing on error but not on success.) Using close() on the original fd
caused "Text file busy" errors and prevented the cloned tmpfs container from
starting.
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Serge Hallyn [Sat, 13 Aug 2016 15:21:57 +0000 (10:21 -0500)]
Merge pull request #1127 from brauner/2016-08-13/add_missing_newline
tools: add missing newline in lxc-create output
Christian Brauner [Sat, 13 Aug 2016 14:04:44 +0000 (16:04 +0200)]
tools: add missing newline in lxc-create output
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Serge Hallyn [Sat, 13 Aug 2016 02:01:31 +0000 (21:01 -0500)]
Merge pull request #1125 from brauner/2016-08-12/smarter_btrfs_subvol_detection
bdev: be smarter about btrfs subvolume detection
Serge Hallyn [Sat, 13 Aug 2016 02:00:12 +0000 (21:00 -0500)]
Merge pull request #1126 from brauner/2016-08-13/fix_runtime_path_for_lxc_ls
tools: use correct runtime path for lxc-ls
Christian Brauner [Fri, 12 Aug 2016 22:56:33 +0000 (00:56 +0200)]
tools: use correct runtime path for lxc-ls
So far we've simply been using RUNTIME_PATH for the privileged and unprivileged
case. We should actually use XDG_RUNTIME_DIR for the unprivileged case.
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Christian Brauner [Fri, 12 Aug 2016 19:07:34 +0000 (21:07 +0200)]
bdev: be smarter about btrfs subvolume detection
When a container c is on a btrfs filesystem but is directory backed, copying
the container will default to snapshot. This is because of
should_default_to_snapshot() returning true in this case because c is on a
btrfs filesystem. We should make sure that should_default_to_snapshot() only
returns true, when c itself is a btrfs subvolume.
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Christian Brauner [Fri, 12 Aug 2016 08:35:43 +0000 (10:35 +0200)]
Merge pull request #1120 from tenforward/update_man
Update English and Japanese lxc-attach(1)
KATOH Yasufumi [Fri, 12 Aug 2016 08:29:55 +0000 (17:29 +0900)]
doc: Update Japanese lxc-attach(1)
* Add undocumented options (-v/--set-var, --keep-var, -f/--rcfile)
* Change order of option in SYNOPSIS (-L that is placed after "command")
* Add long options in SYNOPSIS
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
KATOH Yasufumi [Fri, 12 Aug 2016 08:04:15 +0000 (17:04 +0900)]
doc: Update lxc-attach(1)
* Add undocumented options (-v/--set-var, --keep-var, -f/--rcfile)
* Change order of option in SYNOPSIS (-L that is placed after "command")
* Add long options in SYNOPSIS
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Serge Hallyn [Fri, 12 Aug 2016 05:55:48 +0000 (00:55 -0500)]
Merge pull request #1119 from brauner/2016-08-11/fix_log_output
log: fix log_append_stderr()
Christian Brauner [Thu, 11 Aug 2016 21:10:17 +0000 (23:10 +0200)]
log: fix log_append_stderr()
Log output currently looks like this:
lxc-copy: debbdev/lxcdir.c: dir_clonepaths: 45 directories cannot be snapshotted. Try aufs or overlayfs.
we rather want it to be:
lxc-copy: deb: bdev/lxcdir.c: dir_clonepaths: 45 directories cannot be snapshotted. Try aufs or overlayfs.
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Serge Hallyn [Thu, 11 Aug 2016 14:25:34 +0000 (09:25 -0500)]
Merge pull request #1118 from brauner/2016-08-09/remove_readdir_r
tree-wide: replace readdir_r() with readdir()
Christian Brauner [Tue, 9 Aug 2016 19:05:19 +0000 (21:05 +0200)]
tree-wide: replace readdir_r() with readdir()
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Stéphane Graber [Sun, 7 Aug 2016 14:33:09 +0000 (16:33 +0200)]
Merge pull request #1116 from clandmeter/alpine-aarch64
templates: add support for new arch on Alpine Linux
Carlo Landmeter [Sun, 7 Aug 2016 09:21:05 +0000 (09:21 +0000)]
templates: add support for new arch on Alpine Linux
Signed-off-by: Carlo Landmeter <clandmeter@gmail.com>
Christian Brauner [Thu, 4 Aug 2016 22:58:24 +0000 (00:58 +0200)]
Merge pull request #1114 from Blub/lxc-attach-f
lxc-attach: add -f option & cleanup
Wolfgang Bumiller [Thu, 4 Aug 2016 09:28:37 +0000 (11:28 +0200)]
whitespace cleanup
The rest of this block uses spaces instead of tabs already.
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Wolfgang Bumiller [Thu, 4 Aug 2016 09:23:54 +0000 (11:23 +0200)]
add -f option to lxc-attach
Otherwise a container with a non-standard configuration file
can be started but not attached to.
Fixes the following case:
# lxc-start -n ct -f /different/path/my.config
# lxc-attach -n ct
Error: container ct is not defined
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Christian Brauner [Tue, 2 Aug 2016 08:11:49 +0000 (10:11 +0200)]
Merge pull request #1111 from ysbnim/master
doc: Add documentation of lxc.syslog to Korean lxc.container.conf(5)
Sungbae Yoo [Tue, 2 Aug 2016 02:44:12 +0000 (11:44 +0900)]
doc: Add documentation of lxc.syslog to Korean lxc.container.conf(5)
Update for commit
204dfdf
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Stéphane Graber [Mon, 1 Aug 2016 19:05:12 +0000 (21:05 +0200)]
Merge pull request #1109 from brauner/2016-07-31/append_to_search_path
partially reorganize repo
Christian Brauner [Mon, 1 Aug 2016 11:57:24 +0000 (13:57 +0200)]
Merge pull request #1110 from tenforward/japanese
doc: Add documentation of lxc.syslog to Japanese lxc.container.conf(5)
KATOH Yasufumi [Mon, 1 Aug 2016 11:46:16 +0000 (20:46 +0900)]
doc: Add documentation of lxc.syslog to Japanese lxc.container.conf(5)
and add local6 to valid facility
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Christian Brauner [Sun, 31 Jul 2016 10:40:49 +0000 (12:40 +0200)]
tools, tests: reorganize repo
- tools: move lxc commands to common subfolder
- tests: adapt include search path
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Christian Brauner [Sun, 31 Jul 2016 10:21:58 +0000 (12:21 +0200)]
cgroups: move cgroup files to common subfolder
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Christian Brauner [Sun, 31 Jul 2016 10:04:28 +0000 (12:04 +0200)]
bdev: add subdirectories to search path
This allows us to avoid using relative includes which is cleaner in the long
run when we create subdirectories for other components of liblxc.
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Christian Brauner [Fri, 29 Jul 2016 23:23:42 +0000 (01:23 +0200)]
Merge pull request #1105 from bapt/syslog
Add syslog support
Baptiste Daroussin [Fri, 29 Jul 2016 14:21:59 +0000 (16:21 +0200)]
Add documentation for the new syslog logging mechanism
Signed-off-by: Baptiste Daroussin <bapt@gandi.net>
Baptiste Daroussin [Fri, 8 Jul 2016 09:35:11 +0000 (11:35 +0200)]
Add a new logger: syslog and Print the VM name in the logs
To activate it specify lxc.syslog = <afacility>
For now the available facilities are: daemon, local[0-7] others will be
rejected
syslog got only activated after the function that checks for inheritance
of fd is passed in order to make sure the syslog fd is not inherited
and prevent the creation of the fd is any log have been issued during
the checks (which would end up in an infinite loop)
Signed-off-by: Fatih ACAR <fatih.acar@gandi.net>
Signed-off-by: Ahmed Amamou <ahmed@gandi.net>
Signed-off-by: Baptiste Daroussin <bapt@gandi.net>
Signed-off-by: William Dauchy <william@gandi.net>
Stéphane Graber [Fri, 29 Jul 2016 06:35:26 +0000 (08:35 +0200)]
Merge pull request #1108 from brauner/2016-07-29/fix_android_part_n
criu: replace tmpnam() with mkstemp()
Christian Brauner [Thu, 28 Jul 2016 22:53:53 +0000 (00:53 +0200)]
criu: replace tmpnam() with mkstemp()
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Christian Brauner [Thu, 28 Jul 2016 14:52:05 +0000 (16:52 +0200)]
Merge pull request #1106 from Blub/next
conf: set pty_info to NULL after free
Wolfgang Bumiller [Thu, 28 Jul 2016 09:52:18 +0000 (11:52 +0200)]
conf: set pty_info to NULL after free
This fixes a double free corruption on container-requested
reboots when lxc_spawn() fails before receiving the ttys, as
lxc_fini() (part of __lxc_start()'s cleanup) calls
lxc_delete_tty().
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
Christian Brauner [Thu, 28 Jul 2016 11:23:58 +0000 (13:23 +0200)]
Merge pull request #1102 from chenhaiq/master
attach: use setns instead of unshare
Stéphane Graber [Thu, 28 Jul 2016 10:30:27 +0000 (12:30 +0200)]
Merge pull request #1104 from brauner/2016-07-27/fix_android_getline
Revert "Merge pull request #1103 from brauner/2016-07-27/fix_android_…
Christian Brauner [Thu, 28 Jul 2016 08:56:46 +0000 (10:56 +0200)]
Revert "Merge pull request #1103 from brauner/2016-07-27/fix_android_getline"
This reverts commit
25796416084f3cecf036bd922d6ead094500191e , reversing
changes made to
813d7f1453e6e28adc0fdfac62d9c4597a87e430 .
Contrary to what we suspected the android build errors were not caused by
missing wrong relative include paths. Rather, they were caused by autoconf.
Signed-off-by: Christian Brauner <cbrauner@suse.de>
oc [Wed, 27 Jul 2016 14:43:58 +0000 (22:43 +0800)]
attach: setns instead of unshare in lxc-attach
lxc-checkpoint will fail because process createdy by lxc-attach has
incorrect cgroup ns. It needs to use "setns" instead of "unshare"
to set cgroup ns.
Signed-off-by: Chen Haiquan <oc@yunify.com>
Stéphane Graber [Wed, 27 Jul 2016 16:28:53 +0000 (12:28 -0400)]
Merge pull request #1103 from brauner/2016-07-27/fix_android_getline
bdev: include own getline function in bdev.h
Christian Brauner [Wed, 27 Jul 2016 16:07:34 +0000 (18:07 +0200)]
bdev: include own getline function in bdev.h
Fixes android build error:
bdev/bdev.c: In function 'detect_fs':
bdev/bdev.c:686:2: error: implicit declaration of function 'getline' [-Werror=implicit-function-declaration]
while (getline(&line, &linelen, f) != -1) {
^
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Stéphane Graber [Tue, 26 Jul 2016 09:16:46 +0000 (05:16 -0400)]
Merge pull request #1101 from sergiusens/pkgconfig-prefix
Add a prefix to the lxc.pc
Sergio Schvezov [Tue, 26 Jul 2016 07:41:47 +0000 (09:41 +0200)]
Add a prefix to the lxc.pc
This allows installing to different locations and using
the lxc.pc to build using the generated includedir and
libdir.
Signed-off-by: Sergio Schvezov <sergio.schvezov@ubuntu.com>
Stéphane Graber [Mon, 25 Jul 2016 15:44:28 +0000 (11:44 -0400)]
Merge pull request #1100 from brauner/2016-07-25/fix_cgfsng_lxcfs_and_cgroupfs_checkfuns
cgfsng: fix is_lxcfs() and is_cgroupfs()
Christian Brauner [Mon, 25 Jul 2016 15:10:47 +0000 (17:10 +0200)]
cgfsng: fix is_lxcfs() and is_cgroupfs()
Both functions advertise that they return true when strncmp() == 0 and false
when strncmp() != 0 but so far they returned the exact opposite.
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Christian Brauner [Sat, 23 Jul 2016 19:31:24 +0000 (21:31 +0200)]
Merge pull request #1097 from jirutka/patch-1
lxc-alpine: mount tmpfs under /run
Jakub Jirutka [Sat, 23 Jul 2016 17:57:36 +0000 (19:57 +0200)]
lxc-alpine: mount tmpfs under /run
When running under grsecurity kernel or userns, it can't be mounted from inside.
Signed-off-by: Jakub Jirutka <jakub@jirutka.cz>
Stéphane Graber [Fri, 22 Jul 2016 20:30:50 +0000 (22:30 +0200)]
Merge pull request #1094 from brauner/2016-07-22/fix_android_lxc_copy
lxc-copy: do not use mkostemp and dprintf
Christian Brauner [Fri, 22 Jul 2016 19:59:24 +0000 (21:59 +0200)]
lxc-copy: do not use mkostemp and dprintf
Fixes android builds:
DSBINDIR=\"/data/lxc/lxc/sbin\" -I/build/libcap/libcap/include/ -Wall -Werror -MT lxc_copy.o -MD -MP -MF $depbase.Tpo -c -o lxc_copy.o lxc_copy.c &&\
mv -f $depbase.Tpo $depbase.Po
lxc_copy.c: In function 'mount_tmpfs':
lxc_copy.c:834:2: error: implicit declaration of function 'mkostemp' [-Werror=implicit-function-declaration]
fd = mkostemp(premount, O_CLOEXEC);
^
lxc_copy.c:841:2: error: implicit declaration of function 'dprintf' [-Werror=implicit-function-declaration]
ret = dprintf(fd, "#! /bin/sh\n"
^
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Stéphane Graber [Fri, 22 Jul 2016 15:10:20 +0000 (17:10 +0200)]
Merge pull request #1093 from brauner/2016-07-22/use_priu64
c/r: use PRIu64 format specifier
Christian Brauner [Fri, 22 Jul 2016 09:14:24 +0000 (11:14 +0200)]
c/r: use PRIu64 format specifier
Fixes build failures on arm:
criu.c: In function ‘exec_criu’:
criu.c:310:4: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘uint64_t’ [-Werror=format=]
ret = sprintf(ghost_limit, "%lu", opts->user->ghost_limit);
^
In file included from criu.c:42:0:
log.h:285:9: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘uint64_t’ [-Werror=format=]
struct lxc_log_locinfo locinfo = LXC_LOG_LOCINFO_INIT; \
^
criu.c:312:5: note: in expansion of macro ‘ERROR’
ERROR("failed to print ghost limit %lu", opts->user->ghost_limit);
^
Signed-off-by: Christian Brauner <cbrauner@suse.de>
Stéphane Graber [Thu, 21 Jul 2016 20:50:44 +0000 (22:50 +0200)]
Merge pull request #1092 from LicoMonch/extend-debian-template
simple enhancements of lxc-debian-template-script
Andreas Freudenberg [Fri, 15 Jul 2016 14:59:01 +0000 (16:59 +0200)]
templates: make shellcheck (Ubuntu: 0.3.7-5 amd64) most possible happy
Signed-off-by: Andreas Freudenberg <andreas.freudenberg@licomonch.net>
Andreas Freudenberg [Tue, 12 Jul 2016 15:53:08 +0000 (17:53 +0200)]
templates: add more quotes to variables (at least $rootfs should now be covered)
Signed-off-by: Andreas Freudenberg <andreas.freudenberg@licomonch.net>
Andreas Freudenberg [Tue, 12 Jul 2016 15:51:06 +0000 (17:51 +0200)]
templates: avoid noisy perl warnings caused by missing locales
Signed-off-by: Andreas Freudenberg <andreas.freudenberg@licomonch.net>
Christian Brauner [Wed, 20 Jul 2016 09:10:25 +0000 (11:10 +0200)]
Merge pull request #1091 from ysbnim/master
doc: Update Korean lxc-copy(1) to include tmpfs option
Sungbae Yoo [Wed, 20 Jul 2016 08:58:26 +0000 (17:58 +0900)]
doc: Update Korean lxc-copy(1) to include tmpfs option
Update for commit
a361e56
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Christian Brauner [Wed, 20 Jul 2016 08:32:36 +0000 (10:32 +0200)]
Merge pull request #1074 from vel21ripn/vlan_mtu
Set up MTU for vlan-type interfaces.
Christian Brauner [Wed, 20 Jul 2016 08:13:28 +0000 (10:13 +0200)]
Merge pull request #1090 from tenforward/japanese
doc: Update Japanese lxc-copy(1) to include tmpfs option
KATOH Yasufumi [Wed, 20 Jul 2016 06:56:46 +0000 (15:56 +0900)]
doc: Update Japanese lxc-copy(1) to include tmpfs option
Update for commit
a361e56
Signed-off-by: KATOH Yasufumi <karma@jazz.email.ne.jp>
Christian Brauner [Tue, 19 Jul 2016 22:26:30 +0000 (00:26 +0200)]
Merge pull request #1089 from tych0/ghost-limit
c/r: add support for ghost-limit in CRIU
Tycho Andersen [Tue, 19 Jul 2016 20:27:26 +0000 (14:27 -0600)]
c/r: add support for ghost-limit in CRIU
This is an old option that we probably should have exposed long ago :)
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Serge Hallyn [Tue, 19 Jul 2016 17:49:19 +0000 (12:49 -0500)]
Merge pull request #1086 from brauner/detect_sigrtmin_3
[RFC]: lxccontainer: detect if we should send SIGRTMIN+3