[lxc-devel] [lxc/lxc] b33233: doc: Add LXC-specific mount option in Japanese lxc...

GitHub noreply at github.com
Mon Sep 21 15:48:14 UTC 2015


  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: b332333b435ce02b535c05efc08fb1b969b1d895
      https://github.com/lxc/lxc/commit/b332333b435ce02b535c05efc08fb1b969b1d895
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M doc/ja/lxc.container.conf.sgml.in

  Log Message:
  -----------
  doc: Add LXC-specific mount option in Japanese lxc.container.conf(5)

Add the description of optional, create=file/dir for lxc.mount.entry.
This is update for commit f5b67b3.

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 3635c5eee86309092d2a3636126401796e387529
      https://github.com/lxc/lxc/commit/3635c5eee86309092d2a3636126401796e387529
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M doc/ja/lxc-destroy.sgml.in
    M doc/lxc-destroy.sgml.in

  Log Message:
  -----------
  doc: Add the common and '-s' option in lxc-destroy(1)

* Add the description of '-s' option
* Remove '-P' option, and add common options
* Improve Japanese translation

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 7ee64c0f21688b42ea4b82d4d1cf962325bc947f
      https://github.com/lxc/lxc/commit/7ee64c0f21688b42ea4b82d4d1cf962325bc947f
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M doc/ja/lxc.container.conf.sgml.in

  Log Message:
  -----------
  doc: Add lxc.init_(uid|gid) in Japanese lxc.container.conf(5)

update for commit dbca923

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 7c3d3950528671460bcd333af842a6158e4166b6
      https://github.com/lxc/lxc/commit/7c3d3950528671460bcd333af842a6158e4166b6
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M doc/ja/lxc-snapshot.sgml.in

  Log Message:
  -----------
  doc: Update Japanese lxc-snapshot(1) for newname option

Update for commit dedd4f6

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: b7349f15f76789ceef3ee3e1865c4e156bc760b6
      https://github.com/lxc/lxc/commit/b7349f15f76789ceef3ee3e1865c4e156bc760b6
  Author: Sungbae Yoo <sungbae.yoo at samsung.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M doc/ko/lxc.container.conf.sgml.in

  Log Message:
  -----------
  doc: Add LXC-specific mount option in Korean lxc.container.conf(5)

Update for commit f5b67b3

Signed-off-by: Sungbae Yoo <sungbae.yoo at samsung.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 0a05624e82005bd85086964559446d603ee57b34
      https://github.com/lxc/lxc/commit/0a05624e82005bd85086964559446d603ee57b34
  Author: Sungbae Yoo <sungbae.yoo at samsung.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M doc/ko/lxc-clone.sgml.in

  Log Message:
  -----------
  doc: Add the rename option to lxc-clone(1) in Korean manual

Update for commit 585f3c6

Signed-off-by: Sungbae Yoo <sungbae.yoo at samsung.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 3703aa9e73301bf46826b200b7ac353a8b56c43a
      https://github.com/lxc/lxc/commit/3703aa9e73301bf46826b200b7ac353a8b56c43a
  Author: Sungbae Yoo <sungbae.yoo at samsung.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M doc/ko/lxc.system.conf.sgml.in

  Log Message:
  -----------
  doc: Update Korean lxc.cgroup.use in lxc.system.conf(5)

Update for commit 2d8632d

Signed-off-by: Sungbae Yoo <sungbae.yoo at samsung.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 5033e12328bbf0c140b64ef2c663ee66b22917c3
      https://github.com/lxc/lxc/commit/5033e12328bbf0c140b64ef2c663ee66b22917c3
  Author: Sungbae Yoo <sungbae.yoo at samsung.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M doc/ko/lxc.container.conf.sgml.in

  Log Message:
  -----------
  doc: Add lxc.init_(uid|gid) in Korean lxc.container.conf(5)

update for commit dbca923

Signed-off-by: Sungbae Yoo <sungbae.yoo at samsung.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 76072aec5c984b9e91bd4344ab013e38d8bff311
      https://github.com/lxc/lxc/commit/76072aec5c984b9e91bd4344ab013e38d8bff311
  Author: Sungbae Yoo <sungbae.yoo at samsung.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M doc/ko/lxc-snapshot.sgml.in

  Log Message:
  -----------
  doc: Update Korean lxc-snapshot(1) for newname option

Update for commit dedd4f6

Signed-off-by: Sungbae Yoo <sungbae.yoo at samsung.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 108b88ce3187e08cc630e17903f8e7748a545be1
      https://github.com/lxc/lxc/commit/108b88ce3187e08cc630e17903f8e7748a545be1
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M config/apparmor/profiles/lxc-default-with-nesting
    M config/templates/Makefile.am
    A config/templates/nesting.conf.in
    M configure.ac

  Log Message:
  -----------
  Add a nesting.conf which can be included to support nesting containers (v2)

Newer kernels have added a new restriction:  if /proc or /sys on the
host has files or non-empty directories which are over-mounted, and
there is no /proc which fully visible, then it assumes there is a
"security" reason for this.  It prevents anyone in a non-initial user
namespace from creating a new proc or sysfs mount.

To work around this, this patch adds a new 'nesting.conf' which can be
lxc.include'd from a container configuration file.  It adds a
non-overmounted mount of /proc and /sys under /dev/.lxc, so that the
kernel can see that we're not trying to *hide* things like /proc/uptime.
and /sys/devices/virtual/net.  If the host adds this to the config file
for container w1, then container w1 will support unprivileged child
containers.

The nesting.conf file also sets the apparmor profile to the with-nesting
variant, since that is required anyway.  This actually means that
supporting nesting isn't really more work than it used to be, just
different.  Instead of adding

lxc.aa_profile = lxc-container-default-with-nesting

you now just need to

lxc.include = /usr/share/lxc/config/nesting.conf

(Look, fewer characters :)

Finally, in order to maintain the current apparmor protections on
proc and sys, we make /dev/.lxc/{proc,sys} non-read/writeable.
We don't need to be able to use them, we're just showing the
kernel what's what.

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


  Commit: c4532a2036fd4a9283275b499b7a379fa9689172
      https://github.com/lxc/lxc/commit/c4532a2036fd4a9283275b499b7a379fa9689172
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M src/tests/Makefile.am
    A src/tests/lxc-test-snapdeps

  Log Message:
  -----------
  Add tests for snapshot clone dependencies

Test edge cases (removing first and last entries in lxc_snapshots and the very
last snapshot) and make sure original container isn't destroyed while there are
snapshots, and is when there are none.

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


  Commit: ffe9a25a03197651a8ecb638fa3b5232a3213b00
      https://github.com/lxc/lxc/commit/ffe9a25a03197651a8ecb638fa3b5232a3213b00
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M src/lxc/lxc_info.c

  Log Message:
  -----------
  Fix reallocation calculation

Signed-off-by: Christian Brauner <christianvanbrauner at gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: 186bef0024dbd15fe859b5fec7f78de5c9fee8eb
      https://github.com/lxc/lxc/commit/186bef0024dbd15fe859b5fec7f78de5c9fee8eb
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M src/lxc/bdev.c

  Log Message:
  -----------
  overlayfs_clone: rsync the mounted rootfs

Closes #655

We can't rsync the delta as unpriv user because we can't create
the chardevs representing a whiteout.  We can however rsync the
rootfs and have the kernel create the whiteouts for us.

do_rsync: pass --delete

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


  Commit: 8796becf362dda006e014bed3c7e3c7091e7728c
      https://github.com/lxc/lxc/commit/8796becf362dda006e014bed3c7e3c7091e7728c
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M src/lxc/conf.h
    M src/lxc/confile.c

  Log Message:
  -----------
  Add lxc.ephemeral lxc.ephemeral indicates whether a container will be destroyed on shutdown Can be 0 for non-ephemeral and 1 for ephemeral.

Signed-off-by: Christian Brauner <christianvanbrauner at gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: 339c6f1fb45e2db646376aa4f5ce61fa94f20648
      https://github.com/lxc/lxc/commit/339c6f1fb45e2db646376aa4f5ce61fa94f20648
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M src/lxc/bdev.c
    M src/lxc/bdev.h

  Log Message:
  -----------
  Add bdev_destroy() and bdev_destroy_wrapper()

static do_bdev_destroy() and bdev_destroy_wrapper() from lxccontainer.c become
public bdev_destroy() and bdev_destroy_wrapper() in bdev.c and bdev.h

Signed-off-by: Christian Brauner <christianvanbrauner at gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: 297c2d5893fc8f1290a90c8dc44295738dc0b0a3
      https://github.com/lxc/lxc/commit/297c2d5893fc8f1290a90c8dc44295738dc0b0a3
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  Destroy bdevs using bdev_destroy() from bdev.h

Signed-off-by: Christian Brauner <christianvanbrauner at gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: 28272964d4897d4d9c8cf1c6b8fd1942e09d45e5
      https://github.com/lxc/lxc/commit/28272964d4897d4d9c8cf1c6b8fd1942e09d45e5
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M src/lxc/start.c

  Log Message:
  -----------
  Enable lxc_fini() to destroy container on shutdown

When lxc.ephemeral is set to 1 in the containers config it will be destroyed on
shutdown.

Signed-off-by: Christian Brauner <christianvanbrauner at gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: af651aa9e1ae642a586884b7875df60351be2c75
      https://github.com/lxc/lxc/commit/af651aa9e1ae642a586884b7875df60351be2c75
  Author: Stephane Nguyen <stephminh at yahoo.es>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  Fixing MTU calculation in instantiate_veth()]

Signed-off-by: Stephane Nguyen <stephminh at yahoo.es>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: 42342bed255ed2cb72e371e1890c264f04201042
      https://github.com/lxc/lxc/commit/42342bed255ed2cb72e371e1890c264f04201042
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  Ensure that mmap()ed memory is \0-terminated (v3)

Use pwrite() to write terminating \0-byte

This allows us to use standard string handling functions and we can avoid using
the GNU-extension memmem(). This simplifies removing the container from the
lxc_snapshots file. Wrap strstr() in a while loop to remove duplicate entries.

Signed-off-by: Christian Brauner <christianvanbrauner at gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: 3b63f6e487282c1858ea242990eb7d2c4f46db06
      https://github.com/lxc/lxc/commit/3b63f6e487282c1858ea242990eb7d2c4f46db06
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  gitignore: add strange lxc at .service file

I have no idea what this file is, but the build system seems to be
generating it, so let's ignore it.

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: 80a706b3616b32f02e623a11f71ca3eec390b436
      https://github.com/lxc/lxc/commit/80a706b3616b32f02e623a11f71ca3eec390b436
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  gitignore: add Korean man page output

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: aee755ee520fef240afbf8d937b36373906c397c
      https://github.com/lxc/lxc/commit/aee755ee520fef240afbf8d937b36373906c397c
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M src/lxc/lxc-checkconfig.in

  Log Message:
  -----------
  lxc-checkconfig: add some more config options

Here's some more config options that we do actually require to be able to
boot containers.

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: d825fff3cae40b89c26d838847021239e89df922
      https://github.com/lxc/lxc/commit/d825fff3cae40b89c26d838847021239e89df922
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  Make mod_all_rdeps() public It will now also be called from start.c

Signed-off-by: Christian Brauner <christianvanbrauner at gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: f01f7975c1bec35dea8e1d7412c3eed95dd4812c
      https://github.com/lxc/lxc/commit/f01f7975c1bec35dea8e1d7412c3eed95dd4812c
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-09-21 (Mon, 21 Sep 2015)

  Changed paths:
    M src/lxc/start.c

  Log Message:
  -----------
  Remove ephemeral containers from lxc_snapshots

On shutdown ephemeral containers will be destroyed. We use mod_all_rdeps() from
lxccontainer.c to update the lxc_snapshots file of the original container. We
also include lxclock.h to lock the container when mod_all_rdeps() is called to
avoid races.

Signed-off-by: Christian Brauner <christianvanbrauner at gmail.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/f08fee55a1f0...f01f7975c1be


More information about the lxc-devel mailing list