On RHEL 5, 'file' command prints 'AMD x86-64' for 'x86-64' arch.

diff --git a/perl/lib/Sys/Guestfs/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm
index 601b3f4..be17a30 100644 (file)
--- a/perl/lib/Sys/Guestfs/Lib.pm
+++ b/perl/lib/Sys/Guestfs/Lib.pm
@@ -381,6 +381,8 @@ sub _elf_arch_to_canonical
        return "i486";  # probably not in the wild
     } elsif ($_ eq "x86-64") {
        return "x86_64";
        return "i486";  # probably not in the wild
     } elsif ($_ eq "x86-64") {
        return "x86_64";

+    } elsif ($_ eq "AMD x86-64") {
+       return "x86_64";

     } elsif (/SPARC32/) {
        return "sparc";
     } elsif (/SPARC V9/) {
     } elsif (/SPARC32/) {
        return "sparc";
     } elsif (/SPARC V9/) {