[lxc-devel] [lxc/lxc] 3fb22c: Remounts bind mounts if read-only flag is provided

Tue Dec 2 17:21:44 UTC 2014

  Branch: refs/heads/stable-1.0
  Home:   https://github.com/lxc/lxc
  Commit: 3fb22c29dcb647826aacd227efa506b17f50fcac
      https://github.com/lxc/lxc/commit/3fb22c29dcb647826aacd227efa506b17f50fcac
  Author: Abin Shahab <ashahab at altiscale.com>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  Remounts bind mounts if read-only flag is provided

Bind mounts do not honor filesystem mount options. This change will
remount filesystems that are bind mounted if there are changes to
filesystem mount options, specifically if the mount is readonly.

Signed-off-by: Abin Shahab <ashahab at altiscale.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

  Commit: ba1a2aec883b2ae257ef8b1a9a513cce08a999e8
      https://github.com/lxc/lxc/commit/ba1a2aec883b2ae257ef8b1a9a513cce08a999e8
  Author: Stéphane Graber <stgraber at ubuntu.com>
  Date:   2014-12-01 (Mon, 01 Dec 2014)

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

  Log Message:
  -----------
  tabs/spaces consistency

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>

  Commit: 641539c43fa9411b1d7b38d63948bfe8243d4b34
      https://github.com/lxc/lxc/commit/641539c43fa9411b1d7b38d63948bfe8243d4b34
  Author: Alexander Dreweke <alexander at dreweke.net>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M templates/lxc-debian.in

  Log Message:
  -----------
  lxc-debian: added support for package installation

- added --mirror, --security-mirror and --package parameters
- generate source.list
- install packages into final lxc instance

Update by Stéphane Graber for stable-1.0:
 - Drop the addition of --packages (new feature)

Signed-off-by: Alexander Dreweke <alexander at dreweke.net>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>

  Commit: 956bd66602324393f3e66e82d97205e109f246f3
      https://github.com/lxc/lxc/commit/956bd66602324393f3e66e82d97205e109f246f3
  Author: Gu1 <gu1 at aeroxteam.fr>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M templates/lxc-debian.in

  Log Message:
  -----------
  lxc-debian: Fix default mirrors

Fix a typo in the lines inserted in the default sources.list.
Change the default mirror to http.debian.net which is (supposedly) more
accurate and better than cdn.debian.net for a generic configuration.
Use security.debian.org directly for the {release}/updates repository.

Signed-off-by: Gu1 <gu1 at aeroxteam.fr>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>

  Commit: 26da72b6241fb9f4cc3572b2b008f5f6f5dad231
      https://github.com/lxc/lxc/commit/26da72b6241fb9f4cc3572b2b008f5f6f5dad231
  Author: Antonio Terceiro <terceiro at debian.org>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M templates/lxc-debian.in

  Log Message:
  -----------
  lxc-debian: support systemd as PID 1

Containers with systemd need a somewhat special setup, which I borrowed
and adapted from lxc-fedora. These changes are required so that Debian 8
(jessie) containers work properly, and are a no-op for previous Debian
versions.

Signed-off-by: Antonio Terceiro <terceiro at debian.org>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

  Commit: 9b1762ef85e26d4b929a048d95a86417dc03ac51
      https://github.com/lxc/lxc/commit/9b1762ef85e26d4b929a048d95a86417dc03ac51
  Author: Cameron Norman <camerontnorman at gmail.com>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M templates/lxc-debian.in

  Log Message:
  -----------
  lxc-debian: adjust init system configurations

Do as much as possible to allow containers switching from non-systemd to
systemd to work as intended (but nothing that will cause side effects).
Use update-rc.d disable instead of remove so the init scripts are not
re-enabled when the package is updated

Signed-off-by: Cameron Norman <camerontnorman at gmail.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>

  Commit: 969f8964285318a4f2550929322dbf8dfce2e31e
      https://github.com/lxc/lxc/commit/969f8964285318a4f2550929322dbf8dfce2e31e
  Author: Cameron Norman <CameronNemo at users.noreply.github.com>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M templates/lxc-debian.in

  Log Message:
  -----------
  lxc-debian: mask both Wheezy and Jessie udev services

Signed-off-by: Cameron Norman <camerontnorman at gmail.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>

  Commit: 3ae4a3ce649c479212c5e2b8cda5777957ea14f9
      https://github.com/lxc/lxc/commit/3ae4a3ce649c479212c5e2b8cda5777957ea14f9
  Author: Johannes Kastl <mail at ojkastl.de>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M templates/lxc-opensuse.in

  Log Message:
  -----------
  lxc-opensuse: Disabling builds on openSUSE Tumbleweed, detection improved.

Signed-off-by: Johannes Kastl <git at ojkastl.de>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>

  Commit: de1230232db796d739fe649d82467a8f346d57e5
      https://github.com/lxc/lxc/commit/de1230232db796d739fe649d82467a8f346d57e5
  Author: Casey Marshall <cmars at cmarstech.com>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M src/lxc/confile.c

  Log Message:
  -----------
  Allow lxc_clear_config_item to clear idmaps.

Ran into this when trying to automate stgraber's "GUI in containers"
post.

Signed-off-by: Casey Marshall <casey.marshall at canonical.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>

  Commit: 1b49e7d03b44652db581c738e4f476201cbaaf1b
      https://github.com/lxc/lxc/commit/1b49e7d03b44652db581c738e4f476201cbaaf1b
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M src/lxc/bdev.c

  Log Message:
  -----------
  overlay and aufs clone_paths: be more robust

Currently when we clone a container, bdev_copy passes NULL as dst argument
of bdev_init, then sees bdev->dest (as a result) is NULL, and sets
bdev->dest to $lxcpath/$name/rootfs.  so $ops->clone_paths() can
assume that "/rootfs" is at the end of the path.  The overlayfs and
aufs clonepaths do assume that and index to endofstring-6 and append
delta0.  Let's be more robust by actually finding the last / in
the path.

Then, instead of always setting oldbdev->dest to $lxcpath/$name/rootfs,
set it to oldbdev->src.  Else dir_clonepaths fails when mounting src
onto dest bc dest does not exist.  We could also fix that by creating
bdev->dest if needed, but that addes an empty directory to the old
container.

This fixes 'lxc-clone -o x1 -n x2' if x1 has lxc.rootfs = /var/lib/lxc/x1/x
and makes the overlayfs and aufs paths less fragile should something else
change.

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

  Commit: b73d3bbce39c49bd75ac2a7db0eb4151be2a7563
      https://github.com/lxc/lxc/commit/b73d3bbce39c49bd75ac2a7db0eb4151be2a7563
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M src/lxc/bdev.c

  Log Message:
  -----------
  overlayfs: overlayfs.v22 or higher needs workdir option

This patch creates workdir as "olwork", and retry mount with workdir
option when mount is failed.
It is used to prepare files before atomically swithing with
destination, and needs to be on the same filesystem as upperdir. It's
OK for it to be empty.

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>

  Commit: 3858c11b3b9ff7fabac2296ddd55d26e5aba7d3a
      https://github.com/lxc/lxc/commit/3858c11b3b9ff7fabac2296ddd55d26e5aba7d3a
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    M src/lxc/bdev.c

  Log Message:
  -----------
  Fix clone issues

This commit fixes two issues at the time of clone:
* unnecessary directory is created when clone between overlayfs/aufs
* clone failed when the end of rootfs path is not "/rootfs"

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

Compare: https://github.com/lxc/lxc/compare/07d79178fd71...3858c11b3b9f