PERFORCE change 127198 for review

Thu Oct 4 16:47:13 PDT 2007

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

Change 127198 by cnst at dale on 2007/10/04 23:46:34

	integrate

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/etc.defaults/rc.conf#3 integrate
.. //depot/projects/soc2007/cnst-sensors/etc.rc.d/Makefile#3 integrate
.. //depot/projects/soc2007/cnst-sensors/sys.conf/files#7 integrate
.. //depot/projects/soc2007/cnst-sensors/sys.modules/Makefile#4 integrate
.. //depot/projects/soc2007/cnst-sensors/usr.bin.systat/pigs.c#3 integrate
.. //depot/projects/soc2007/cnst-sensors/usr.sbin/Makefile#3 integrate

Differences ...

==== //depot/projects/soc2007/cnst-sensors/etc.defaults/rc.conf#3 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.317 2007/09/06 21:00:48 mlaier Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.318 2007/09/28 10:38:08 bushman Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -497,7 +497,6 @@
 auditd_enable="NO"	# Run the audit daemon.
 auditd_program="/usr/sbin/auditd"	# Path to the audit daemon.
 auditd_flags=""		# Which options to pass to the audit daemon.
-cached_enable="NO"	# Run the nsswitch caching daemon.
 cron_enable="YES"	# Run the periodic job daemon.
 cron_program="/usr/sbin/cron"	# Which cron executable to run (if enabled).
 cron_dst="YES"		# Handle DST transitions intelligently (YES/NO)
@@ -505,6 +504,7 @@
 lpd_enable="NO"		# Run the line printer daemon.
 lpd_program="/usr/sbin/lpd"	# path to lpd, if you want a different one.
 lpd_flags=""		# Flags to lpd (if enabled).
+nscd_enable="NO"	# Run the nsswitch caching daemon.
 chkprintcap_enable="NO"	# Run chkprintcap(8) before running lpd.
 chkprintcap_flags="-d"	# Create missing directories by default.
 dumpdev="AUTO"		# Device to crashdump to (device name, AUTO, or NO).

==== //depot/projects/soc2007/cnst-sensors/etc.rc.d/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.83 2007/09/07 15:44:09 mlaier Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.84 2007/09/28 10:38:08 bushman Exp $
 
 .include <bsd.own.mk>
 
@@ -48,7 +48,7 @@
 .endif
 
 .if ${MK_NS_CACHING} != "no"
-FILES+= cached
+FILES+= nscd
 .endif
 
 FILESDIR=	/etc/rc.d

==== //depot/projects/soc2007/cnst-sensors/sys.conf/files#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1242 2007/08/09 01:11:21 marcel Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1243 2007/09/23 07:34:22 pjd Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -1303,6 +1303,9 @@
 geom/shsec/g_shsec.c		optional geom_shsec
 geom/stripe/g_stripe.c		optional geom_stripe
 geom/uzip/g_uzip.c		optional geom_uzip
+geom/virstor/binstream.c	optional geom_virstor
+geom/virstor/g_virstor.c	optional geom_virstor
+geom/virstor/g_virstor_md.c	optional geom_virstor
 geom/zero/g_zero.c		optional geom_zero
 gnu/fs/ext2fs/ext2_alloc.c		optional ext2fs \
 	warning "kernel contains GPL contaminated ext2fs filesystem"

==== //depot/projects/soc2007/cnst-sensors/sys.modules/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.539 2007/08/15 19:26:02 des Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.540 2007/09/26 21:14:18 marius Exp $
 
 .include <bsd.own.mk>
 
@@ -87,7 +87,7 @@
 	firewire \
 	firmware \
 	fxp \
-	${_gem} \
+	gem \
 	geom \
 	${_harp} \
 	hatm \
@@ -585,7 +585,6 @@
 _ath_rate_amrr=	ath_rate_amrr
 _ath_rate_onoe=	ath_rate_onoe
 _ath_rate_sample=ath_rate_sample
-_gem=		gem
 _powermac_nvram=	powermac_nvram
 _smbfs=		smbfs
 .endif
@@ -598,7 +597,6 @@
 _ath_rate_sample=ath_rate_sample
 _auxio=		auxio
 _em=		em
-_gem=		gem
 _i2c=		i2c
 _sound=		sound
 .endif

==== //depot/projects/soc2007/cnst-sensors/usr.bin.systat/pigs.c#3 (text+ko) ====

@@ -38,7 +38,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/systat/pigs.c,v 1.23 2007/09/11 07:51:03 ru Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/systat/pigs.c,v 1.24 2007/09/17 05:27:19 jeff Exp $");
 
 /*
  * Pigs display from Bill Reeves at Lucasfilm
@@ -174,7 +174,7 @@
 		pt[i].pt_kp = &kpp[i];
 		pctp = &pt[i].pt_pctcpu;
 		ftime = kpp[i].ki_swtime;
-		if (ftime == 0 || (kpp[i].ki_sflag & PS_INMEM) == 0)
+		if (ftime == 0 || (kpp[i].ki_flag & P_INMEM) == 0)
 			*pctp = 0;
 		else
 			*pctp = ((double) kpp[i].ki_pctcpu /

==== //depot/projects/soc2007/cnst-sensors/usr.sbin/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.371 2007/07/28 00:12:21 thompsa Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.373 2007/10/01 18:22:32 ru Exp $
 
 .include <bsd.own.mk>
 
@@ -27,7 +27,6 @@
 	bsnmpd \
 	${_btxld} \
 	burncd \
-	${_cached} \
 	cdcontrol \
 	chkgrp \
 	chown \
@@ -109,6 +108,7 @@
 	ngctl \
 	nghook \
 	nologin \
+	${_nscd} \
 	ntp \
 	${_nvram} \
 	${_ofwdump} \
@@ -269,14 +269,17 @@
 _authpf=	authpf
 .endif
 
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
+_pppctl=	pppctl
+.endif
+
 .if ${MK_LPR} != "no"
 _lpr=		lpr
 .endif
 
 .if ${MK_NS_CACHING} != "no"
-.if ${MK_LIBTHR} != "no" || \
-    (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no")
-_cached=	cached
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
+_nscd=		nscd
 .endif
 .endif
 
@@ -314,9 +317,6 @@
 _mptable=	mptable
 _ndiscvt=	ndiscvt
 _pnpinfo=	pnpinfo
-.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no"
-_pppctl=	pppctl
-.endif
 _sicontrol=	sicontrol
 _spkrtest=	spkrtest
 _zzz=		zzz
@@ -350,9 +350,6 @@
 _mount_smbfs=	mount_smbfs
 _mptable=	mptable
 _ndiscvt=	ndiscvt
-.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no"
-_pppctl=	pppctl
-.endif
 _sicontrol=	sicontrol
 _spkrtest=	spkrtest
 _zzz=		zzz
@@ -364,9 +361,6 @@
 .endif
 _kgmon=		kgmon
 _mount_smbfs=	mount_smbfs
-.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no"
-_pppctl=	pppctl
-.endif
 _zzz=		zzz
 .endif
 
@@ -378,9 +372,6 @@
 .if ${MACHINE_ARCH} == "sparc64"
 _eeprom=	eeprom
 _ofwdump=	ofwdump
-.if ${MK_LIBTHR} != "no"
-_pppctl=	pppctl
-.endif
 .endif
 
 .include <bsd.subdir.mk>
