[lxc-devel] [lxc/lxc] 44050f: Fix typo
GitHub
noreply at github.com
Mon Mar 20 21:40:53 UTC 2017
Branch: refs/heads/stable-2.0
Home: https://github.com/lxc/lxc
Commit: 44050f3ee2020a2949f9805eb6bb73da70ea6db1
https://github.com/lxc/lxc/commit/44050f3ee2020a2949f9805eb6bb73da70ea6db1
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/monitor.c
Log Message:
-----------
Fix typo
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
Commit: 00a7a30109f402e0afe29f8746bc81ae930a3a75
https://github.com/lxc/lxc/commit/00a7a30109f402e0afe29f8746bc81ae930a3a75
Author: Brett Neumeier <brett at neumeier.us>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/start.c
Log Message:
-----------
Allow build without sys/capability.h
There is no guard clause around a reference to CAP_EFFECTIVE and
CAP_SETGID, causing compilation to fail if sys/capability.h is not
available.
Signed-off-by: Brett Neumeier <brett at neumeier.us>
Commit: 6865ec3c97e17408fd09e386d291af5ff7b495b0
https://github.com/lxc/lxc/commit/6865ec3c97e17408fd09e386d291af5ff7b495b0
Author: Maxime Besson <mabes at users.noreply.github.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M templates/lxc-opensuse.in
Log Message:
-----------
lxc-opensuse: fix default value for release code
Signed-off-by: Maxime Besson <maxime.besson at smile.fr>
Commit: dbea19e6419820800247e0a805f3377953a9b5c9
https://github.com/lxc/lxc/commit/dbea19e6419820800247e0a805f3377953a9b5c9
Author: Tycho Andersen <tycho.andersen at canonical.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/utils.c
Log Message:
-----------
util: always malloc for setproctitle
Closes #1407
Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
Commit: 3cd2868b14cd040b9fdbec728d5179053ddd6d15
https://github.com/lxc/lxc/commit/3cd2868b14cd040b9fdbec728d5179053ddd6d15
Author: Tycho Andersen <tycho.andersen at canonical.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/utils.c
Log Message:
-----------
util: update setproctitle comments
Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
Commit: 86b0cf232db22e08d8a3af7d3944dd17aad5daa4
https://github.com/lxc/lxc/commit/86b0cf232db22e08d8a3af7d3944dd17aad5daa4
Author: Christian Brauner <christian.brauner at ubuntu.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/confile.c
Log Message:
-----------
confile: clear lxc.network.<n>.ipv{4,6} when empty
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
Commit: 7a33a08a6950d9a5be7fc8ee68e36967cc4fa150
https://github.com/lxc/lxc/commit/7a33a08a6950d9a5be7fc8ee68e36967cc4fa150
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/console.c
Log Message:
-----------
lxc_setup_tios(): Ignore SIGTTOU and SIGTTIN signals
Prevent an endless loop while executing lxc-attach in the background:
The kernel might fire SIGTTOU while an ioctl() in tcsetattr()
is executed. When the ioctl() is resumed and retries,
the signal handler interrupts it again.
We can't configure the TTY to stop sending
the signals in the first place since that
is a modification/write to the TTY already.
Still we clear the TOSTOP flag to prevent further signals.
Command to reproduce the hang:
----------------------------
cat > lxc_hang.sh << EOF
/usr/bin/timeout 5s /usr/bin/lxc-attach -n SOMECONTAINER -- /bin/true
EOF
sh lxc_hang.sh # hangs
----------------------------
Signed-off-by: Thomas Jarosch <thomas.jarosch at intra2net.com>
Commit: 8470f20027cc3344d55ae2f475f7d0723c354393
https://github.com/lxc/lxc/commit/8470f20027cc3344d55ae2f475f7d0723c354393
Author: Carsten Brandt <mail at cebe.cc>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M config/init/common/lxc-net.in
Log Message:
-----------
Make lxc-net return non-zero on failure
I found that even though the service lxc-net failed to start because I made some wrong configuration
settings the command exists zero.
So systemd reports the status of the service as good even though it failed:
# service lxc-net status
● lxc-net.service - LXC network bridge setup
Loaded: loaded (/lib/systemd/system/lxc-net.service; enabled)
Active: active (exited) since Wed 2017-02-08 08:17:32 EST; 21min ago
Process: 529 ExecStart=/usr/lib/x86_64-linux-gnu/lxc/lxc-net start (code=exited, status=0/SUCCESS)
Main PID: 529 (code=exited, status=0/SUCCESS)
CGroup: /system.slice/lxc-net.service
Feb 08 08:17:30 dvm2 systemd[1]: Starting LXC network bridge setup...
Feb 08 08:17:32 dvm2 lxc-net[529]: dnsmasq: failed to create listening socket for 10.2.2.1: Address already in use
Feb 08 08:17:32 dvm2 lxc-net[529]: Failed to setup lxc-net.
Feb 08 08:17:32 dvm2 systemd[1]: Started LXC network bridge setup.
Adding `exit 1` here makes it exit non-zero to make systemd recognize the failure.
Signed-off-by: Carsten Brandt <mail at cebe.cc>
Commit: 483b44198a464e9763b13a94f93b57e303741d8b
https://github.com/lxc/lxc/commit/483b44198a464e9763b13a94f93b57e303741d8b
Author: Adam Borowski <kilobyte at angband.pl>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/seccomp.c
Log Message:
-----------
seccomp: allow x32 guests on amd64 hosts.
Without this patch, x32 guests (and no others) worked "natively" with x32
host lxc, but not on regular amd64 hosts. That was especially problematic
as a number of ioctls such as those needed by netfilter don't work in such
scenarios, thus you want to run amd64 on the host.
With the patch, you can use all three ABIs: i386 x32 amd64 on amd64 hosts.
Despite x32 being little used, there's no reason to deny it by default:
the admin needs to compile their own kernel with CONFIG_X86_X32=y or (on
Debian) boot with syscall.x32=y. If they've done so, it is a reasonable
assumption they want x32 guests.
Signed-off-by: Adam Borowski <kilobyte at angband.pl>
Commit: 768770715092c699eda199255f2f6f8a6f6cab49
https://github.com/lxc/lxc/commit/768770715092c699eda199255f2f6f8a6f6cab49
Author: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M configure.ac
M src/lxc/caps.c
M src/lxc/caps.h
M src/lxc/conf.c
M src/lxc/start.c
Log Message:
-----------
Add HAVE_LIBCAP
Currently it is impossible to build lxc with --disable-capabilities if
the user has libcap-dev installed on his system as:
- calls to cap_xxx functions are not protected by HAVE_LIBCAP defines.
The whole file is only protected by HAVE_SYS_CAPABILITY_H.
- AC_CHECK_LIB default action-if-found is overriden by [true] so
HAVE_LIBCAP is never written to config.h
This patch replaces all HAVE_SYS_CAPABILITY_H checks by HAVE_LIBCAP
checks (fix #1361)
Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
Commit: 00ed6a7f1c978ccb053edde42a70ae0b0e6e848f
https://github.com/lxc/lxc/commit/00ed6a7f1c978ccb053edde42a70ae0b0e6e848f
Author: Tycho Andersen <tycho.andersen at canonical.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/criu.c
Log Message:
-----------
c/r: only supply --ext-mount-map for bind mounts
The rest of the mounts can be restored normally.
Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
Commit: 89b4d6ff265bd487e6f214d9597862442c52c4aa
https://github.com/lxc/lxc/commit/89b4d6ff265bd487e6f214d9597862442c52c4aa
Author: McCabe, Robert J <Robert.McCabe at rockwellcollins.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/cgroups/cgfs.c
Log Message:
-----------
Added 'mkdir -p' functionality in create_or_remove_cgroup
This allows us to run LXC containers from within docker
Signed-off-by: McCabe, Robert J <Robert.McCabe at rockwellcollins.com>
Commit: a2a3d25c22381d990e80cbd48a473c967c8f248c
https://github.com/lxc/lxc/commit/a2a3d25c22381d990e80cbd48a473c967c8f248c
Author: Matt Keeler <mkeeler at users.noreply.github.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M hooks/clonehostname
Log Message:
-----------
Use LXC_ROOTFS_MOUNT in clonehostname hook
Previously this hook did not work when cloning containers using an overlayfs snapshot as the LXC_ROOTFS_PATH didn't point to the actual filesystem that the container would see. LXC_ROOTFS_MOUNT should be used instead and in fact lxc.container.conf man page says that you usually would want to use the _MOUNT variant.
Signed-off-by: Matt Keeler <mjkeeler7 at gmail.com>
Commit: e839039c14ea997aaabe07368c33f4811b9bf606
https://github.com/lxc/lxc/commit/e839039c14ea997aaabe07368c33f4811b9bf606
Author: Evgeni Golov <evgeni at debian.org>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M templates/lxc-debian.in
Log Message:
-----------
squeeze is not a supported release anymore, drop the key
Signed-off-by: Evgeni Golov <evgeni at debian.org>
Commit: 6e2bf212645d4c799fdb58d37499de0508437050
https://github.com/lxc/lxc/commit/6e2bf212645d4c799fdb58d37499de0508437050
Author: Christian Brauner <christian.brauner at ubuntu.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/start.c
Log Message:
-----------
start: dumb down SIGCHLD from WARN() to NOTICE()
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
Commit: c70748d1d5d1abf969aa25baca727b74c3a395d8
https://github.com/lxc/lxc/commit/c70748d1d5d1abf969aa25baca727b74c3a395d8
Author: Christian Brauner <christian.brauner at ubuntu.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/log.c
Log Message:
-----------
log: fix lxc_unix_epoch_to_utc()
The conversion algorithm used uses a clever trick by letting a year start at 1
March. So we need to add 1 for January and February.
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
Commit: f35896aeec98aa3b7ccf88e4118b85843ab594d6
https://github.com/lxc/lxc/commit/f35896aeec98aa3b7ccf88e4118b85843ab594d6
Author: Christian Brauner <christian.brauner at ubuntu.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/cgroups/cgfsng.c
Log Message:
-----------
cgfsng: make trim() safer
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
Commit: 92acbf2f7f0b0275b8d0fd9044cc9457ea136709
https://github.com/lxc/lxc/commit/92acbf2f7f0b0275b8d0fd9044cc9457ea136709
Author: Serge Hallyn <serge at hallyn.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/seccomp.c
Log Message:
-----------
seccomp: set SCMP_FLTATR_ATL_TSKIP if available
Newer libseccomp has a flag called SCMP_FLTATR_ATL_TSKIP which
allows syscall '-1' (nop) to be executed. Without that flag,
debuggers cannot skip system calls inside containers. For reference,
see the seccomp(2) manpage, which says:
The tracer can skip the system call by changing the system call number to -1.
and see the seccomp issue #80
Signed-off-by: Serge Hallyn <serge at hallyn.com>
Commit: 4350bfc4389f85d9d2acb2100a00bf5d482da633
https://github.com/lxc/lxc/commit/4350bfc4389f85d9d2acb2100a00bf5d482da633
Author: Christian Brauner <christian.brauner at ubuntu.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/lxc_user_nic.c
Log Message:
-----------
lxc-user-nic: re-order #includes
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
Commit: f6c0d0b36724160dfe83f7cd31c24bd0dcddb816
https://github.com/lxc/lxc/commit/f6c0d0b36724160dfe83f7cd31c24bd0dcddb816
Author: Christian Brauner <christian.brauner at ubuntu.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/lxc_user_nic.c
Log Message:
-----------
lxc-user-nic: improve + bugfix
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
Commit: 2bde6a96014d6f909e151938d6bcf610386b0bd9
https://github.com/lxc/lxc/commit/2bde6a96014d6f909e151938d6bcf610386b0bd9
Author: Christian Brauner <christian.brauner at ubuntu.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/lxc_user_nic.c
Log Message:
-----------
lxc-user-nic: delete link on failure
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
Commit: e0e26721102268a9256f50620512cc0d6600b278
https://github.com/lxc/lxc/commit/e0e26721102268a9256f50620512cc0d6600b278
Author: Christian Brauner <christian.brauner at ubuntu.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/conf.c
Log Message:
-----------
conf: only try to delete veth when privileged
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
Commit: 215fff92e49f2a183db01403023052d632acbf64
https://github.com/lxc/lxc/commit/215fff92e49f2a183db01403023052d632acbf64
Author: Harald Dunkel <harald.dunkel at aixigo.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M config/init/common/lxc-containers.in
Log Message:
-----------
Fix lxc-containers to support multiple bridges
Signed-off-by: Harald Dunkel <harald.dunkel at aixigo.de>
Commit: 0391995a3c5a9255c8a366bec9599f456a16374a
https://github.com/lxc/lxc/commit/0391995a3c5a9255c8a366bec9599f456a16374a
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M config/init/common/lxc-containers.in
Log Message:
-----------
Fix mixed tab/spaces in previous patch
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
Commit: 3088ce244682123bcd3610a915e52f40402b9d20
https://github.com/lxc/lxc/commit/3088ce244682123bcd3610a915e52f40402b9d20
Author: Jakub Jirutka <jakub at jirutka.cz>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M templates/lxc-alpine.in
Log Message:
-----------
lxc-alpine: use dl-cdn.a.o as default mirror instead of random one
Some mirrors from the mirrors list are not very reliable and it seems
that no one really wants to use some random mirror as the default
option.
Signed-off-by: Jakub Jirutka <jakub at jirutka.cz>
Commit: c3d52854787fc00de84f8dfe46e517140f40631b
https://github.com/lxc/lxc/commit/c3d52854787fc00de84f8dfe46e517140f40631b
Author: Serge Hallyn <serge at hallyn.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/tools/lxc-checkconfig.in
Log Message:
-----------
lxc-checkconfig: verify new[ug]idmap are setuid-root
Signed-off-by: Serge Hallyn <serge at hallyn.com>
Commit: f8bed24cee10615813567e65629dd6124f7d7ac3
https://github.com/lxc/lxc/commit/f8bed24cee10615813567e65629dd6124f7d7ac3
Author: otofune <otofune at gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M templates/lxc-archlinux.in
Log Message:
-----------
[templates] archlinux: resolve conflicting files
- already found /etc/localtime
- duplicate creation /etc/resolv.conf
Signed-off-by: otofune <otofune at gmail.com>
Commit: 3bd24f75102c76401a78e165be90a9275eb8a39c
https://github.com/lxc/lxc/commit/3bd24f75102c76401a78e165be90a9275eb8a39c
Author: otofune <otofune at gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M templates/lxc-archlinux.in
Log Message:
-----------
[templates] archlinux: noneed default_timezone variable
Signed-off-by: otofune <otofune at gmail.com>
Commit: 6db96171bafaf8aa8684022e68cd10ac19bf502b
https://github.com/lxc/lxc/commit/6db96171bafaf8aa8684022e68cd10ac19bf502b
Author: Stéphane Graber <stgraber at ubuntu.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/python-lxc/lxc.c
Log Message:
-----------
python3: Deal with potential NULL char*
Closes #1466
Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
Commit: c586a4dcc923ce6bbe0304642bd738d7b5faff21
https://github.com/lxc/lxc/commit/c586a4dcc923ce6bbe0304642bd738d7b5faff21
Author: Tai Kedzierski <dch.tai at gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M templates/lxc-download.in
Log Message:
-----------
lxc-download.in / allow setting keyserver from env
Checks if DOWNLOAD_KEYSERVER has already been set in the environment before setting a value
Signed-off-by: Tai Kedzierski <dch.tai at gmail.com>
Commit: bff08b8d265c0a1a896b3462ed0124f97f81fcd6
https://github.com/lxc/lxc/commit/bff08b8d265c0a1a896b3462ed0124f97f81fcd6
Author: Tai Kedzierski <dch.tai at gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M templates/lxc-download.in
Log Message:
-----------
lxc-download.in / Document keyserver change in help
Signed-off-by: Tai Kedzierski <dch.tai at gmail.com>
Commit: e1adf44ef2c0828ea9031b2225b32fe543a99cde
https://github.com/lxc/lxc/commit/e1adf44ef2c0828ea9031b2225b32fe543a99cde
Author: Tai Kedzierski <dch.tai at gmail.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M templates/lxc-download.in
Log Message:
-----------
Change variable check to match existing style
Signed-off-by: Tai Kedzierski <dch.tai at gmail.com>
Commit: 1750a26028f6e6543795fe6b1d26e8f241348390
https://github.com/lxc/lxc/commit/1750a26028f6e6543795fe6b1d26e8f241348390
Author: Christian Brauner <christian.brauner at ubuntu.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/bdev/lxclvm.c
M src/lxc/conf.c
Log Message:
-----------
tree-wide: include <sys/sysmacros.h> directly
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
Commit: 1b060788e597f1ad639f53b51c20f44e7ca177fc
https://github.com/lxc/lxc/commit/1b060788e597f1ad639f53b51c20f44e7ca177fc
Author: Christian Brauner <christian.brauner at ubuntu.com>
Date: 2017-03-20 (Mon, 20 Mar 2017)
Changed paths:
M src/lxc/conf.c
M src/lxc/confile.c
M src/lxc/utils.c
Log Message:
-----------
conf/ile: make sure buffer is large enough
conf.c: In function 'lxc_assign_network':
conf.c:3096:25: error: '%lu' directive output may be truncated writing between 1 and 20 bytes into a region of size 19 [-Werror=format-truncation=]
snprintf(pidstr, 19, "%lu", (unsigned long) pid);
^~~
conf.c:3096:24: note: using the range [1, 18446744073709551615] for directive argument
snprintf(pidstr, 19, "%lu", (unsigned long) pid);
^~~~~
In file included from /usr/include/stdio.h:938:0,
from conf.c:35:
/usr/include/x86_64-linux-gnu/bits/stdio2.h:64:10: note: format output between 2 and 21 bytes into a destination of size 19
return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
__bos (__s), __fmt, __va_arg_pack ());
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
confile.c: In function 'network_new_hwaddrs':
confile.c:2889:38: error: '%02x' directive output may be truncated writing between 2 and 8 bytes into a region of size 6 [-Werror=format-truncation=]
snprintf(hwaddr, 18, "00:16:3e:%02x:%02x:%02x",
^~~~
confile.c:2889:23: note: using the range [0, 4294967295] for directive argument
snprintf(hwaddr, 18, "00:16:3e:%02x:%02x:%02x",
^~~~~~~~~~~~~~~~~~~~~~~~~
confile.c:2889:23: note: using the range [0, 4294967295] for directive argument
In file included from /usr/include/stdio.h:938:0,
from confile.c:24:
/usr/include/x86_64-linux-gnu/bits/stdio2.h:64:10: note: format output between 18 and 36 bytes into a destination of size 18
return __builtin___snprintf_chk (__s, __n, __USE_FORTIFY_LEVEL - 1,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
__bos (__s), __fmt, __va_arg_pack ());
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Not sure whether the latter is really a problem. We might need an additional
fix later on.
Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
Compare: https://github.com/lxc/lxc/compare/d512bd5efb0e...1b060788e597
More information about the lxc-devel
mailing list