From 4a97d539c911e92d07af9f716ae86f357e92ca3d Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 5 Dec 2010 15:24:53 +0100
Subject: [PATCH] Making default argument guessing for non-debian systems a bit
 more robust.

---
 functions/defaults.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 5419ca10a..da8cef404 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -259,8 +259,14 @@ Set_defaults ()
 					LB_ARCHITECTURES="amd64"
 					;;
 				*)
-					Echo_warning "Can't determine architecture, assuming i386"
-					LB_ARCHITECTURES="i386"
+					if [ -e /lib64 ]
+					then
+						LB_ARCHITECTURES="amd64"
+					else
+						LB_ARCHITECTURES="i386"
+					fi
+
+					Echo_warning "Can't determine architecture, assuming ${LB_ARCHITECTURES}"
 					;;
 			esac
 		fi