From owner-svn-src-head@FreeBSD.ORG  Sat Nov 12 19:02:55 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 73CB5106564A;
	Sat, 12 Nov 2011 19:02:55 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 643B48FC0C;
	Sat, 12 Nov 2011 19:02:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pACJ2t7r057361;
	Sat, 12 Nov 2011 19:02:55 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pACJ2tHC057359;
	Sat, 12 Nov 2011 19:02:55 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201111121902.pACJ2tHC057359@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Sat, 12 Nov 2011 19:02:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227470 - head/usr.sbin/pc-sysinstall/backend-query
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Nov 2011 19:02:55 -0000

Author: emaste
Date: Sat Nov 12 19:02:55 2011
New Revision: 227470
URL: http://svn.freebsd.org/changeset/base/227470

Log:
  Report the amount of memory from smbios data if provided.
  
  This should get the correct memory size even if a 32-bit image is running
  on a machine with > 4GB of memory.  This can be useful is using a 32-bit
  installer on a machine which will eventually run a 64-bit image.
  
  Reviewed by:	kmoore

Modified:
  head/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh

Modified: head/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh	Sat Nov 12 17:12:33 2011	(r227469)
+++ head/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh	Sat Nov 12 19:02:55 2011	(r227470)
@@ -25,4 +25,8 @@
 #
 # $FreeBSD$
 
-expr $(sysctl -n hw.realmem) / 1048576
+if smbios_mem=$(kenv -q smbios.memory.enabled); then
+	expr $smbios_mem / 1024
+else
+	expr $(sysctl -n hw.realmem) / 1048576
+fi