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@oracle.com> Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

allow all iX86 strings for lxc.arch
bb8d8207 · Dwight Engen · Serge Hallyn · a0566914 · bb8d8207
Commit bb8d8207 authored Apr 28, 2014 by Dwight Engen Committed by Serge Hallyn Apr 28, 2014
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

confile.c src/lxc/confile.c +7 -1

No files found.
--- 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 },
 	};