[lxc-devel] [PATCH v2] allow all iX86 strings for lxc.arch
Serge Hallyn
serge.hallyn at ubuntu.com
Mon Apr 28 21:17:11 UTC 2014
Quoting Dwight Engen (dwight.engen at oracle.com):
> 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>
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
> ---
> src/lxc/confile.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/src/lxc/confile.c b/src/lxc/confile.c
> index 90fb344..4e7dead 100644
> --- a/src/lxc/confile.c
> +++ b/src/lxc/confile.c
> @@ -1723,9 +1723,15 @@ signed long lxc_config_parse_arch(const char *arch)
> struct per_name {
> char *name;
> unsigned long per;
> - } pername[4] = {
> + } pername[] = {
> { "x86", PER_LINUX32 },
> + { "linux32", PER_LINUX32 },
> + { "i386", PER_LINUX32 },
> + { "i486", PER_LINUX32 },
> + { "i586", PER_LINUX32 },
> { "i686", PER_LINUX32 },
> + { "athlon", PER_LINUX32 },
> + { "linux64", PER_LINUX },
> { "x86_64", PER_LINUX },
> { "amd64", PER_LINUX },
> };
> --
> 1.9.0
>
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel
More information about the lxc-devel
mailing list