[lxc-devel] [lxc/lxc] 5406bd: Make overlayfs mounts work directly

[GitHub]

  Branch: refs/heads/stable-1.1
  Home:   https://github.com/lxc/lxc
  Commit: 5406bd2ce3b64083c99dcb4f05429392258af3a6
      https://github.com/lxc/lxc/commit/5406bd2ce3b64083c99dcb4f05429392258af3a6
  Author: Christian Brauner <christianvanbrauner at gmail.com>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

  Changed paths:
    M src/lxc/conf.c

  Log Message:
  -----------
  Make overlayfs mounts work directly

When users wanted to mount overlay directories with lxc.mount.entry they had to
create upperdirs and workdirs beforehand in order to mount them. To create it
for them we add the functions mount_entry_create_overlay_dirs() and
mount_entry_create_aufs_dirs() which do this for them. User can now simply
specify e.g.:
   lxc.mount.entry = /lower merged overlay lowerdir=/lower,upper=/upper,workdir=/workdir,create=dir

and /upper and /workdir will be created for them. /upper and /workdir need to
be absolute paths to directories which are created under the containerdir (e.g.
under $lxcpath/CONTAINERNAME/). Relative mountpoints, mountpoints outside the
containerdir, and mountpoints within the container's rootfs are ignored. (The
latter *might* change in the future should it be considered safe/useful.)

Specifying
   lxc.mount.entry = /lower merged overlay lowerdir=/lower:/lower2,create=dir

will lead to a read-only overlay mount in accordance with the
kernel-documentation.

Specifying
   lxc.mount.entry = /lower merged overlay lowerdir=/lower,create=dir

will fail when no upperdir and workdir options are given.

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


  Commit: 5b657f6bfee3d6b238a37ad2f3dcac37a224a333
      https://github.com/lxc/lxc/commit/5b657f6bfee3d6b238a37ad2f3dcac37a224a333
  Author: Wolfgang Bumiller <w.bumiller at proxmox.com>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

  Changed paths:
    M src/lxc/start.c

  Log Message:
  -----------
  start.c:preserve_ns: added pid parameter

Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


  Commit: 8cecbd386123dfcb291b96b23a38fb9d74d2ea3b
      https://github.com/lxc/lxc/commit/8cecbd386123dfcb291b96b23a38fb9d74d2ea3b
  Author: Wolfgang Bumiller <w.bumiller at proxmox.com>
  Date:   2015-10-07 (Wed, 07 Oct 2015)

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

  Log Message:
  -----------
  preserve container namespace

Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/e9bcaafeaa73...8cecbd386123