From 22b787d17bf038d50b8f9a31db09c7de3a8f82eb Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Fri, 3 Jul 2009 22:20:05 +0200
Subject: select proper kernel by architecture

---
 appliance/debian/debirf.conf.in |  2 +-
 configure.ac                    | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/appliance/debian/debirf.conf.in b/appliance/debian/debirf.conf.in
index a3dc16fe..12506c55 100644
--- a/appliance/debian/debirf.conf.in
+++ b/appliance/debian/debirf.conf.in
@@ -1,5 +1,5 @@
 DEBIRF_LABEL="debirf-libguestfs"
 DEBIRF_SUITE=@REPO@
 DEBIRF_MIRROR=@MIRROR@/${DEBIRF_DISTRO}
-DEBIRF_KERNEL_ARCH=486
+DEBIRF_KERNEL_ARCH=@DEBIAN_KERNEL_ARCH@
 
diff --git a/configure.ac b/configure.ac
index f0eba8a3..c70d104f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,6 +167,18 @@ else
   test "x$DEBIRF" = "xno" &&
         AC_MSG_ERROR([debirf must be installed])
   DIST="DEBIAN"
+  case $host_cpu in
+      *86)
+          DEBIAN_KERNEL_ARCH=486
+          ;;
+      x86_64)
+          DEBIAN_KERNEL_ARCH=amd64
+          ;;
+      *)
+         DEBIAN_KERNEL_ARCH=$host_cpu
+         ;;
+   esac
+   AC_SUBST(DEBIAN_KERNEL_ARCH)
 fi
 AC_SUBST(DIST)
 
-- 
cgit