[SCM] debian-live branch, master, updated. 1.0.0-2-4-g3da7ba9

[Chris Lamb]

The following commit has been merged in the master branch:
commit d374c093e8a5a19d325e6d1b0dc4f2f3e987aea1
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sun Aug 31 23:46:38 2008 +0100

    Improve architecture auto-detection.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/functions/defaults.sh b/functions/defaults.sh
index 791cf3c..ba3d944 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -237,8 +237,18 @@ Set_defaults ()
 		then
 			LH_ARCHITECTURE="$(dpkg --print-architecture)"
 		else
-			Echo_warning "Can't process file /usr/bin/dpkg, setting architecture to i386"
-			LH_ARCHITECTURE="i386"
+			case "$(uname -m)" in
+				sparc|powerpc)
+					LH_ARCHITECTURE="$(uname -m)"
+					;;
+				x86_64)
+					LH_ARCHITECTURE="amd64"
+					;;
+				*)
+					Echo_warning "Can't determine architecture, assuming i386"
+					LH_ARCHITECTURE="i386"
+					;;
+			esac
 		fi
 	fi
 

-- 
debian-live