[lxc-devel] [lxc/lxc] bb8d82: allow all iX86 strings for lxc.arch

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: bb8d8207c36402ba1282081963b3dcd3356452ec
      https://github.com/lxc/lxc/commit/bb8d8207c36402ba1282081963b3dcd3356452ec
  Author: Dwight Engen <dwight.engen at oracle.com>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M src/lxc/confile.c

  Log Message:
  -----------
  allow all iX86 strings for lxc.arch

This change accepts all the same strings for lxc.arch that setarch(8) does.

Note that we continue to parse plain x86 as PER_LINUX32 so as not to break
existing lxc configuration files.

Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>


  Commit: 1462279962cb8708010a5ed5cbb0e043a610c71c
      https://github.com/lxc/lxc/commit/1462279962cb8708010a5ed5cbb0e043a610c71c
  Author: Dwight Engen <dwight.engen at oracle.com>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M src/lxc/confile.c

  Log Message:
  -----------
  output lxc.arch as i686 for PER_LINUX32

When outputing the lxc.arch setting, use i686 instead of x86 since the
later is not a valid input to setarch, nor will the kernel output
UTS_MACHINE as x86. The kernel sets utsname.machine to i[3456]86, which
all map to PER_LINUX32.

Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/a0566914c241...1462279962cb