[lxc-devel] [lxc/lxc] e6744e: update hwaddr to fill in xx at create time

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: e6744e9b39c20166e900479339076631902e6d8f
      https://github.com/lxc/lxc/commit/e6744e9b39c20166e900479339076631902e6d8f
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2015-01-20 (Tue, 20 Jan 2015)

  Changed paths:
    M src/lxc/confile.c
    M src/tests/Makefile.am
    A src/tests/lxc-test-createconfig

  Log Message:
  -----------
  update hwaddr to fill in xx at create time

Commit 67702c21 regressed the case where lxc-create use a config
file with 'xx:xx' in lxc.network.hwaddr, so that the 'xx' were
preserved in the container's configuration file.  Expand those
in the unexpanded_config file whenever we are reading a
config file which is not coming from a 'lxc.include'.

The config file will have \n-terminated lines, so update
rand_complete_hwaddr to also stop on \n.

Add a test case to make sure xx gets expanded at lxc-create.

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


  Commit: 5fdd4b0c119f5bd14fed3d4a6424e5a4d00c360e
      https://github.com/lxc/lxc/commit/5fdd4b0c119f5bd14fed3d4a6424e5a4d00c360e
  Author: S.Çağlar Onur <caglar at 10ur.org>
  Date:   2015-01-20 (Tue, 20 Jan 2015)

  Changed paths:
    M config/init/common/lxc-net.in

  Log Message:
  -----------
  restore the dropped bits of 1c1bb85ad2b6 and also implement the logic
suggested at
https://lists.linuxcontainers.org/pipermail/lxc-devel/2014-December/010985.html

Signed-off-by: S.Çağlar Onur <caglar at 10ur.org>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/af242ace3ea7...5fdd4b0c119f