[lxc-devel] [lxc/lxc] 36d209: c/r: don't pass --ext-mount-map flag when console=...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 36d2096cf43340701150778d5547ec4f5a127338
      https://github.com/lxc/lxc/commit/36d2096cf43340701150778d5547ec4f5a127338
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2016-03-21 (Mon, 21 Mar 2016)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  c/r: don't pass --ext-mount-map flag when console=none

We don't pass anything on the restore side since we didn't save anything,
but the restore side will expect something if we pass this. Instead, let's
not pass anything.

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>


  Commit: 97e4f1a91f39fa3b4012eedf8f4e56f419dd2cca
      https://github.com/lxc/lxc/commit/97e4f1a91f39fa3b4012eedf8f4e56f419dd2cca
  Author: Tycho Andersen <tycho.andersen at canonical.com>
  Date:   2016-03-21 (Mon, 21 Mar 2016)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  c/r: don't fail if there is no console_fd on restore

If we set lxc.console=none, this fd won't exist, so let's not fail if it
doesn't. We already partially handled this case correctly, so let's
actually handle it correctly :)

Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>


  Commit: f036e5ce58e1e56d151f4fef2b5b9255320b6868
      https://github.com/lxc/lxc/commit/f036e5ce58e1e56d151f4fef2b5b9255320b6868
  Author: Serge Hallyn <serge at hallyn.com>
  Date:   2016-03-21 (Mon, 21 Mar 2016)

  Changed paths:
    M src/lxc/criu.c

  Log Message:
  -----------
  Merge pull request #906 from tych0/fix-console-none-migration

Fix console none migration


Compare: https://github.com/lxc/lxc/compare/ecd852f35e02...f036e5ce58e1