[lxc-devel] [lxc/lxc] c9fc95: network: add missing checks for empty links

GitHub noreply at github.com
Sun Sep 10 18:00:55 UTC 2017


  Branch: refs/heads/stable-2.1
  Home:   https://github.com/lxc/lxc
  Commit: c9fc957a046acbe922d981b2103370c96d4f9830
      https://github.com/lxc/lxc/commit/c9fc957a046acbe922d981b2103370c96d4f9830
  Author: Wolfgang Bumiller <w.bumiller at proxmox.com>
  Date:   2017-09-10 (Sun, 10 Sep 2017)

  Changed paths:
    M src/lxc/network.c

  Log Message:
  -----------
  network: add missing checks for empty links

Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>


  Commit: e824fa42ffdf137f0dcefcb445b65c541c5a702f
      https://github.com/lxc/lxc/commit/e824fa42ffdf137f0dcefcb445b65c541c5a702f
  Author: Wolfgang Bumiller <w.bumiller at proxmox.com>
  Date:   2017-09-10 (Sun, 10 Sep 2017)

  Changed paths:
    M src/lxc/confile_legacy.c
    M src/lxc/confile_utils.c

  Log Message:
  -----------
  cleanup: remove unnecessary zeroing

The entire netdev is zeroed via memset() already. Unions and
all.

Signed-off-by: Wolfgang Bumiller <w.bumiller at proxmox.com>


  Commit: dcf8f12f7c307aa11f9aacf862761cfbf37437e7
      https://github.com/lxc/lxc/commit/dcf8f12f7c307aa11f9aacf862761cfbf37437e7
  Author: LiFeng <lifeng68 at huawei.com>
  Date:   2017-09-10 (Sun, 10 Sep 2017)

  Changed paths:
    M src/lxc/console.c

  Log Message:
  -----------
  console: clean tty state + return 0 on peer exit

In the past, if the console client exited, lxc_console_cb_con return 1. And
the lxc_poll will exit, the process will wait at waitpid. At this moment, the
process could not handle any command (For example get the container state
LXC_CMD_GET_STATE or stop the container LXC_CMD_STOP.).

I think we should clean the tty_state and return 0 in this case. So, we can use
the lxc-console to connect the console of the container. And we will not exit
the function lxc_polland we can handle the commands by lxc_cmd_process

Reproducer prior to this commit:
- open a new terminal, get the tty device name by command tty /dev/pts/6
- set lxc.console.path = /dev/pts/6
- start the container and the ouptut will print to /dev/pts/6
- close /dev/pts/6
- try an operation e.g. getting state with lxc-ls and lxc-ls will hang

Closes #1787.

Signed-off-by: LiFeng <lifeng68 at huawei.com>
Acked-by: Christian Brauner <christian.brauner at ubuntu.com>


  Commit: 7a67fd7bb850cfe1160f2a4de9c6c3b95b048a94
      https://github.com/lxc/lxc/commit/7a67fd7bb850cfe1160f2a4de9c6c3b95b048a94
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2017-09-10 (Sun, 10 Sep 2017)

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

  Log Message:
  -----------
  doc: Translate lxc(7) into Japanese

* Update for commit 594d6e30d6c86f55c340bf49f0aa15b761d7e627
* and some improvements

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>


  Commit: 4b9be2e407a131b35e3aab2602602f22d97a9382
      https://github.com/lxc/lxc/commit/4b9be2e407a131b35e3aab2602602f22d97a9382
  Author: KATOH Yasufumi <karma at jazz.email.ne.jp>
  Date:   2017-09-10 (Sun, 10 Sep 2017)

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

  Log Message:
  -----------
  doc: Add lxc.cgroup.dir to Japanese lxc.container.conf(5)

* and fix a typo in English man

Signed-off-by: KATOH Yasufumi <karma at jazz.email.ne.jp>


  Commit: 1da539b0460076ded2d868233ec0ee4fa3831d15
      https://github.com/lxc/lxc/commit/1da539b0460076ded2d868233ec0ee4fa3831d15
  Author: Christian Brauner <christian.brauner at ubuntu.com>
  Date:   2017-09-10 (Sun, 10 Sep 2017)

  Changed paths:
    M src/lxc/tools/lxc-update-config.in

  Log Message:
  -----------
  tools: fix lxc-upate-config

- replace lxc.network.[i].ipv4 with lxc.net.[i].ipv4.address
- remove lxc.rootfs.backend lines

Closes #1790.

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/e94087c9859b...1da539b04600


More information about the lxc-devel mailing list