From owner-svn-src-head@FreeBSD.ORG  Thu Mar  8 02:00:53 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 873491065677;
	Thu,  8 Mar 2012 02:00:53 +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 766FA8FC13;
	Thu,  8 Mar 2012 02:00:53 +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 q2820r6I020449;
	Thu, 8 Mar 2012 02:00:53 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2820rQP020447;
	Thu, 8 Mar 2012 02:00:53 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201203080200.q2820rQP020447@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 8 Mar 2012 02:00:53 +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: r232681 - 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: Thu, 08 Mar 2012 02:00:53 -0000

Author: emaste
Date: Thu Mar  8 02:00:52 2012
New Revision: 232681
URL: http://svn.freebsd.org/changeset/base/232681

Log:
  Work around broken BIOS memory reporting
  
  Andrzej has a machine with 32GB of RAM, but only 16GB is reported by the
  smbios.memory.enabled.  Thus, use the greater of hw.realmem and the smbios
  value.
  
  Reported by:	Andrzej Tobola <ato of iem pw edu pl>

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	Thu Mar  8 01:48:44 2012	(r232680)
+++ head/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh	Thu Mar  8 02:00:52 2012	(r232681)
@@ -26,7 +26,14 @@
 # $FreeBSD$
 
 if smbios_mem=$(kenv -q smbios.memory.enabled); then
-	expr $smbios_mem / 1024
+	smbios_mem=$(expr $smbios_mem / 1024)
 else
-	expr $(sysctl -n hw.realmem) / 1048576
+	smbios_mem=0
+fi
+realmem=$(expr $(sysctl -n hw.realmem) / 1048576)
+
+if [ $smbios_mem -gt $realmem ]; then
+	echo $smbios_mem
+else
+	echo $realmem
 fi