[lxc-devel] [lxc/lxc] cf03f9: show additional info if btrfs subvolume deletion f...

GitHub noreply at github.com
Fri Aug 22 19:08:57 UTC 2014


  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: cf03f973a8649ac6c74680f788f275f547af51a1
      https://github.com/lxc/lxc/commit/cf03f973a8649ac6c74680f788f275f547af51a1
  Author: S.Çağlar Onur <caglar at 10ur.org>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M src/lxc/bdev.c

  Log Message:
  -----------
  show additional info if btrfs subvolume deletion fails (issue #315)

Unprivileged users require "-o user_subvol_rm_allowed" mount option for btrfs.
Make the INFO level message to ERROR to make it clear, which now says following;

[caglar at qop:~] lxc-destroy -n rubik
lxc_container: Is the rootfs mounted with -o user_subvol_rm_allowed?
lxc_container: Error destroying rootfs for rubik
Destroying rubik failed

Signed-off-by: S.Çağlar Onur <caglar at 10ur.org>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: 2eef2bda81c8e7d4c64ab90105342918e0e65f9d
      https://github.com/lxc/lxc/commit/2eef2bda81c8e7d4c64ab90105342918e0e65f9d
  Author: S.Çağlar Onur <caglar at 10ur.org>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M src/lxc/attach.c

  Log Message:
  -----------
  ignore SIGKILL (CTRL-C) and SIGQUIT (CTRL-\) - issue #313

Signed-off-by: S.Çağlar Onur <caglar at 10ur.org>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: d08779d49d36db9e2dd8ab33a4af9db281a001b5
      https://github.com/lxc/lxc/commit/d08779d49d36db9e2dd8ab33a4af9db281a001b5
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  load_config_locked: update unexp network

When we read a lxc.network.hwaddr line, if it contained any 'x's then
those get quitely filled in at config_network_hwaddr.  If that happens
then we want to save the autogenerated hwaddr in the unexpanded config
so that when we write it to disk, it is saved.

This patch dumbly re-generates the network configuration in the
unexp configuration every time we load a config file, just as we do
after every clone.

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: d5752559f8d6971dfd189fcc5ff17f0bef99498c
      https://github.com/lxc/lxc/commit/d5752559f8d6971dfd189fcc5ff17f0bef99498c
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  chmod container dir to 0770 (v2)

This prevents u2 from going into /home/u1/.local/share/lxc/u1/rootfs
and running setuid-root applications to get write access to u1's
container rootfs.

v2: set umask to 002 for the mkdir.  Otherwise if umask happens to be,
say, 022, then user does not have write permissions under the container
dir and creation of $containerdir/partial file will fail.

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: d79067a726f1b4a06828220cc11dd3cfbc244856
      https://github.com/lxc/lxc/commit/d79067a726f1b4a06828220cc11dd3cfbc244856
  Author: Daniel Miranda <danielkza2 at gmail.com>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M config/etc/Makefile.am
    M configure.ac
    M src/lua-lxc/Makefile.am
    M src/python-lxc/Makefile.am
    R src/python-lxc/setup.py
    A src/python-lxc/setup.py.in

  Log Message:
  -----------
  build: Fix support for split build and source dirs

Building LXC in a separate target directory, by running configure from
outside the source tree, failed with multiple errors, mostly in the
Python and Lua extensions, due to assuming the source dir and build dir
are the same in a few places. To fix that:

- Pre-process setup.py with the appropriate directories at configure
  time
- Introduce the build dir as an include path in the Lua Makefile
- Link the default container configuration file from the alternatives
  in the configure stage, instead of setting a variable and using it
  in the Makefile

Signed-off-by: Daniel Miranda <danielkza2 at gmail.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 2938f7c82b894db4039f050a91fdc3b8c96b7d5e
      https://github.com/lxc/lxc/commit/2938f7c82b894db4039f050a91fdc3b8c96b7d5e
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  mount_entry: use statvfs

Use statvfs instead of parsing /proc/self/mountinfo to check for the
flags we need to and into the msbind mount flags.  This will be faster
and the code is cleaner.

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: e2a7e8dc47df0f188f89e0ef9945c49f126e5475
      https://github.com/lxc/lxc/commit/e2a7e8dc47df0f188f89e0ef9945c49f126e5475
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2014-08-22 (Fri, 22 Aug 2014)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  lxc_mount_auto_mounts: honor existing nodev etc at remounts

Same problem as we had with mount_entry().  lxc_mount_auto_mounts()
sometimes does bind mount followed by remount to change options.
With recent kernels it must pass any preexisting NODEV/NOSUID/etc
flags.

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/61c237221de7...e2a7e8dc47df


More information about the lxc-devel mailing list