mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

filearch: Return 'i386' instead of 'i486' (as documented).

Browse Source 
And some incidental code refactoring.
This commit is contained in:
Richard W.M. Jones
2016-09-15 16:03:58 +01:00
parent 7907abcdc0
commit 59999f055b
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/filearch.c
View File

@@ -70,13 +70,11 @@ canonical_elf_arch (guestfs_h *g,
const char *r;
char *ret;
if (strstr (elf_arch, "Intel 80386"))
if (strstr (elf_arch, "Intel 80386") ||
strstr (elf_arch, "Intel 80486"))
r = "i386";
else if (strstr (elf_arch, "Intel 80486"))
r = "i486";
else if (strstr (elf_arch, "x86-64"))
r = "x86_64";
else if (strstr (elf_arch, "AMD x86-64"))
else if (strstr (elf_arch, "x86-64") ||
strstr (elf_arch, "AMD x86-64"))
r = "x86_64";
else if (strstr (elf_arch, "SPARC32"))
r = "sparc";