[lxc-devel] [lxc/lxc] a69aad: lxcapi_create: don't delete if container rootfs al...

GitHub noreply at github.com
Wed Oct 30 16:59:53 UTC 2013


  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: a69aad27ad5a217a4f58f525fb34f764390dd474
      https://github.com/lxc/lxc/commit/a69aad27ad5a217a4f58f525fb34f764390dd474
  Author: Sheng Yong <shyodx at gmail.com>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  lxcapi_create: don't delete if container rootfs already exists

If lxc.rootfs is specified, we believe rootfs is ready. lxc-start will
check this later. Return true, because the container is created.

Signed-off-by: Sheng Yong <shyodx at gmail.com>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>


  Commit: cd219ae6590646d3a56c61f8bd5195c1c01d934b
      https://github.com/lxc/lxc/commit/cd219ae6590646d3a56c61f8bd5195c1c01d934b
  Author: Sheng Yong <shyodx at gmail.com>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  lxc-create: fix conflict of rootfs.path and template default path

1. rootfs.path set, -t not set: rootfs.path is rootfs path
2. rootfs.path set, -t set: change template default path to rootfs path
3. rootfs.path not set, -t set: template default path is rootfs path
4. rootfs.path not set, -t not set: error
5. rootfs.path set but cannot access: error

Signed-off-by: Sheng Yong <shyodx at gmail.com>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>


  Commit: cf465fe41c937dabd36052f1fd973e5fb539d1ad
      https://github.com/lxc/lxc/commit/cf465fe41c937dabd36052f1fd973e5fb539d1ad
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M src/lxc/lxccontainer.c

  Log Message:
  -----------
  api_create and do_bdev_create: a few more fixes

don't use lxcpath variable for rootfs_path, it's confusing.

if rootfs is passed in and tpath is passed in, return error
before we save a new config, and don't delete the container

make sure to check c->lxc_conf is not NULL before dereferencing it.

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/86b3688b267e...cf465fe41c93


More information about the lxc-devel mailing list