PERFORCE change 150304 for review

[Ed Schouten]

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

Change 150304 by ed at 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>