From owner-p4-projects@FreeBSD.ORG  Mon Sep 22 20:53:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 705FD1065686; Mon, 22 Sep 2008 20:53:50 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3483D1065685
	for <perforce@FreeBSD.org>; Mon, 22 Sep 2008 20:53:50 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 21C8D8FC17
	for <perforce@FreeBSD.org>; Mon, 22 Sep 2008 20:53:50 +0000 (UTC)
	(envelope-from ed@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8MKrofU033372
	for <perforce@FreeBSD.org>; Mon, 22 Sep 2008 20:53:50 GMT
	(envelope-from ed@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8MKroiX033366
	for perforce@freebsd.org; Mon, 22 Sep 2008 20:53:50 GMT
	(envelope-from ed@FreeBSD.org)
Date: Mon, 22 Sep 2008 20:53:50 GMT
Message-Id: <200809222053.m8MKroiX033366@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ed@FreeBSD.org using -f
From: Ed Schouten <ed@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 150304 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Sep 2008 20:53:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=150304

Change 150304 by ed@ed_dull on 2008/09/22 20:53:15

	It seems the pstat(8) changes weren't synced in the previous commit.

Affected files ...

.. //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#9 integrate
.. //depot/projects/mpsafetty/usr.sbin/pstat/pstat.8#6 integrate
.. //depot/projects/mpsafetty/usr.sbin/pstat/pstat.c#8 integrate

Differences ...

==== //depot/projects/mpsafetty/tools/tools/nanobsd/nanobsd.sh#9 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/tools/tools/nanobsd/nanobsd.sh,v 1.39 2008/09/21 18:02:00 simon Exp $
+# $FreeBSD: src/tools/tools/nanobsd/nanobsd.sh,v 1.40 2008/09/22 20:21:39 bms Exp $
 #
 
 set -e
@@ -402,6 +402,10 @@
 			    c - $1, "sectors" > "/dev/stderr"
 			exit 2
 		}
+
+		# Force slice 1 to be marked active. This is necessary
+		# for booting the image from a USB device to work.
+		print "a 1"
 	}
 	' > ${MAKEOBJDIRPREFIX}/_.fdisk
 

==== //depot/projects/mpsafetty/usr.sbin/pstat/pstat.8#6 (text+ko) ====

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)pstat.8	8.5 (Berkeley) 5/13/94
-.\" $FreeBSD: src/usr.sbin/pstat/pstat.8,v 1.51 2008/08/20 22:09:33 ed Exp $
+.\" $FreeBSD: src/usr.sbin/pstat/pstat.8,v 1.52 2008/09/22 19:25:14 ed Exp $
 .\"
 .Dd August 20, 2008
 .Dt PSTAT 8

==== //depot/projects/mpsafetty/usr.sbin/pstat/pstat.c#8 (text+ko) ====

@@ -46,7 +46,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/pstat/pstat.c,v 1.105 2008/08/20 08:31:58 ed Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/pstat/pstat.c,v 1.106 2008/09/22 19:25:14 ed Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>