PERFORCE change 134223 for review

Sam Leffler sam at FreeBSD.org
Sun Jan 27 11:02:27 PST 2008


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

Change 134223 by sam at sam_ebb on 2008/01/27 19:01:40

	IFC @ 134222

Affected files ...

.. //depot/projects/vap/LOCKS#3 integrate
.. //depot/projects/vap/MAINTAINERS#3 integrate
.. //depot/projects/vap/Makefile.inc1#4 integrate
.. //depot/projects/vap/ObsoleteFiles.inc#4 integrate
.. //depot/projects/vap/UPDATING#3 integrate
.. //depot/projects/vap/contrib/gdb/FREEBSD-diffs#1 branch
.. //depot/projects/vap/contrib/top/display.c#3 integrate
.. //depot/projects/vap/contrib/top/layout.h#3 integrate
.. //depot/projects/vap/contrib/top/machine.h#3 integrate
.. //depot/projects/vap/contrib/top/top.c#4 integrate
.. //depot/projects/vap/contrib/top/top.h#3 integrate
.. //depot/projects/vap/etc/defaults/rc.conf#4 integrate
.. //depot/projects/vap/etc/devd.conf#3 integrate
.. //depot/projects/vap/etc/netstart#3 integrate
.. //depot/projects/vap/etc/rc#3 integrate
.. //depot/projects/vap/etc/rc.d/hostid#3 integrate
.. //depot/projects/vap/etc/rc.d/ipfw#3 integrate
.. //depot/projects/vap/etc/rc.d/kerberos#3 integrate
.. //depot/projects/vap/etc/rc.d/mountcritremote#4 integrate
.. //depot/projects/vap/etc/rc.d/netif#3 integrate
.. //depot/projects/vap/etc/rc.d/ppp#3 integrate
.. //depot/projects/vap/etc/rc.firewall#4 integrate
.. //depot/projects/vap/etc/rc.subr#3 integrate
.. //depot/projects/vap/gnu/lib/csu/Makefile#3 integrate
.. //depot/projects/vap/gnu/usr.bin/cvs/Makefile#4 integrate
.. //depot/projects/vap/gnu/usr.bin/cvs/contrib/Makefile#4 integrate
.. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/Makefile#3 integrate
.. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate
.. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kld.c#1 branch
.. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate
.. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/main.c#3 integrate
.. //depot/projects/vap/gnu/usr.bin/gdb/kgdb/trgt.c#3 integrate
.. //depot/projects/vap/include/fts.h#3 integrate
.. //depot/projects/vap/include/unistd.h#4 integrate
.. //depot/projects/vap/lib/libarchive/Makefile#4 integrate
.. //depot/projects/vap/lib/libarchive/archive_read_extract.c#3 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_disk.c#4 integrate
.. //depot/projects/vap/lib/libarchive/archive_write_set_format_cpio_newc.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/Makefile#4 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_disk.c#3 integrate
.. //depot/projects/vap/lib/libarchive/test/test_write_disk_hardlink.c#1 branch
.. //depot/projects/vap/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate
.. //depot/projects/vap/lib/libc/amd64/_fpmath.h#3 integrate
.. //depot/projects/vap/lib/libc/gen/Makefile.inc#4 integrate
.. //depot/projects/vap/lib/libc/gen/Symbol.map#3 integrate
.. //depot/projects/vap/lib/libc/gen/fts-compat.c#3 integrate
.. //depot/projects/vap/lib/libc/gen/fts-compat.h#3 integrate
.. //depot/projects/vap/lib/libc/gen/fts.3#3 integrate
.. //depot/projects/vap/lib/libc/gen/fts.c#3 integrate
.. //depot/projects/vap/lib/libc/i386/_fpmath.h#3 integrate
.. //depot/projects/vap/lib/libc/ia64/_fpmath.h#3 integrate
.. //depot/projects/vap/lib/libc/locale/Makefile.inc#3 integrate
.. //depot/projects/vap/lib/libc/locale/ascii.c#1 branch
.. //depot/projects/vap/lib/libc/locale/mblocal.h#3 integrate
.. //depot/projects/vap/lib/libc/locale/setrunelocale.c#3 integrate
.. //depot/projects/vap/lib/libc/sparc64/_fpmath.h#3 integrate
.. //depot/projects/vap/lib/libc/stdlib/grantpt.c#4 integrate
.. //depot/projects/vap/lib/libc/sys/access.2#4 integrate
.. //depot/projects/vap/lib/libc/sys/flock.2#3 integrate
.. //depot/projects/vap/lib/libfetch/ftp.c#4 integrate
.. //depot/projects/vap/lib/libthr/Makefile#3 integrate
.. //depot/projects/vap/lib/msun/Makefile#4 integrate
.. //depot/projects/vap/lib/msun/Symbol.map#4 integrate
.. //depot/projects/vap/lib/msun/ld128/s_exp2l.c#1 branch
.. //depot/projects/vap/lib/msun/ld80/s_exp2l.c#1 branch
.. //depot/projects/vap/lib/msun/man/exp.3#3 integrate
.. //depot/projects/vap/lib/msun/man/log.3#1 branch
.. //depot/projects/vap/lib/msun/src/e_expf.c#3 integrate
.. //depot/projects/vap/lib/msun/src/k_cos.c#3 integrate
.. //depot/projects/vap/lib/msun/src/k_rem_pio2.c#3 integrate
.. //depot/projects/vap/lib/msun/src/k_rem_pio2f.c#3 delete
.. //depot/projects/vap/lib/msun/src/math.h#4 integrate
.. //depot/projects/vap/lib/msun/src/math_private.h#4 integrate
.. //depot/projects/vap/lib/msun/src/s_exp2.c#3 integrate
.. //depot/projects/vap/lib/msun/src/s_exp2f.c#3 integrate
.. //depot/projects/vap/lib/msun/src/s_log1p.c#3 integrate
.. //depot/projects/vap/lib/msun/src/s_log1pf.c#3 integrate
.. //depot/projects/vap/lib/msun/src/s_rint.c#4 integrate
.. //depot/projects/vap/lib/msun/src/s_rintf.c#3 integrate
.. //depot/projects/vap/lib/msun/src/s_rintl.c#2 integrate
.. //depot/projects/vap/release/amd64/boot_crunch.conf#3 integrate
.. //depot/projects/vap/release/doc/share/misc/dev.archlist.txt#4 integrate
.. //depot/projects/vap/release/fixit.profile#4 integrate
.. //depot/projects/vap/release/i386/boot_crunch.conf#3 integrate
.. //depot/projects/vap/release/ia64/boot_crunch.conf#3 integrate
.. //depot/projects/vap/release/pc98/boot_crunch.conf#3 integrate
.. //depot/projects/vap/release/powerpc/boot_crunch.conf#3 integrate
.. //depot/projects/vap/release/sparc64/boot_crunch.conf#3 integrate
.. //depot/projects/vap/release/sun4v/boot_crunch.conf#3 integrate
.. //depot/projects/vap/sbin/dhclient/dhclient-script#3 integrate
.. //depot/projects/vap/sbin/ipfw/ipfw2.c#4 integrate
.. //depot/projects/vap/sbin/natd/natd.8#4 integrate
.. //depot/projects/vap/sbin/quotacheck/Makefile#3 integrate
.. //depot/projects/vap/sbin/quotacheck/preen.c#3 integrate
.. //depot/projects/vap/sbin/quotacheck/quotacheck.8#3 integrate
.. //depot/projects/vap/sbin/quotacheck/quotacheck.c#4 integrate
.. //depot/projects/vap/sbin/quotacheck/quotacheck.h#1 branch
.. //depot/projects/vap/share/man/man4/Makefile#4 integrate
.. //depot/projects/vap/share/man/man4/axe.4#3 integrate
.. //depot/projects/vap/share/man/man4/coda.4#1 branch
.. //depot/projects/vap/share/man/man4/dcons.4#3 integrate
.. //depot/projects/vap/share/man/man4/ed.4#4 integrate
.. //depot/projects/vap/share/man/man4/mfi.4#3 integrate
.. //depot/projects/vap/share/man/man4/oldcard.4#3 delete
.. //depot/projects/vap/share/man/man4/pcib.4#2 integrate
.. //depot/projects/vap/share/man/man4/puc.4#3 integrate
.. //depot/projects/vap/share/man/man4/sched_4bsd.4#3 integrate
.. //depot/projects/vap/share/man/man4/sched_ule.4#3 integrate
.. //depot/projects/vap/share/man/man4/sf.4#3 integrate
.. //depot/projects/vap/share/man/man4/syncache.4#4 integrate
.. //depot/projects/vap/share/man/man4/vlan.4#3 integrate
.. //depot/projects/vap/share/man/man4/xl.4#3 integrate
.. //depot/projects/vap/share/man/man5/fstab.5#3 integrate
.. //depot/projects/vap/share/man/man5/rc.conf.5#4 integrate
.. //depot/projects/vap/share/man/man5/src.conf.5#4 integrate
.. //depot/projects/vap/share/man/man7/clocks.7#3 integrate
.. //depot/projects/vap/share/man/man7/ports.7#4 integrate
.. //depot/projects/vap/share/man/man9/BUF_ISLOCKED.9#1 branch
.. //depot/projects/vap/share/man/man9/BUF_RECURSED.9#1 branch
.. //depot/projects/vap/share/man/man9/BUF_REFCNT.9#3 delete
.. //depot/projects/vap/share/man/man9/Makefile#3 integrate
.. //depot/projects/vap/share/man/man9/VOP_LOCK.9#4 integrate
.. //depot/projects/vap/share/man/man9/lock.9#4 integrate
.. //depot/projects/vap/share/man/man9/style.9#4 integrate
.. //depot/projects/vap/share/misc/bsd-family-tree#4 integrate
.. //depot/projects/vap/share/misc/pci_vendors#3 integrate
.. //depot/projects/vap/share/mk/bsd.own.mk#4 integrate
.. //depot/projects/vap/share/mklocale/la_LN.US-ASCII.src#3 integrate
.. //depot/projects/vap/share/zoneinfo/leapseconds#3 integrate
.. //depot/projects/vap/sys/Makefile#6 integrate
.. //depot/projects/vap/sys/amd64/amd64/pmap.c#7 integrate
.. //depot/projects/vap/sys/amd64/include/_types.h#6 integrate
.. //depot/projects/vap/sys/amd64/include/float.h#3 integrate
.. //depot/projects/vap/sys/amd64/isa/clock.c#6 integrate
.. //depot/projects/vap/sys/arm/arm/pmap.c#7 integrate
.. //depot/projects/vap/sys/arm/xscale/ixp425/if_npe.c#3 integrate
.. //depot/projects/vap/sys/boot/forth/loader.conf.5#5 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#7 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#7 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#7 integrate
.. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#7 integrate
.. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#7 integrate
.. //depot/projects/vap/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 integrate
.. //depot/projects/vap/sys/compat/opensolaris/sys/kmem.h#3 integrate
.. //depot/projects/vap/sys/conf/files#12 integrate
.. //depot/projects/vap/sys/conf/options#9 integrate
.. //depot/projects/vap/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate
.. //depot/projects/vap/sys/crypto/rijndael/rijndael-api.c#3 integrate
.. //depot/projects/vap/sys/crypto/rijndael/test00.c#3 integrate
.. //depot/projects/vap/sys/ddb/db_capture.c#2 integrate
.. //depot/projects/vap/sys/dev/acpica/acpi.c#6 integrate
.. //depot/projects/vap/sys/dev/acpica/acpi_hpet.c#3 integrate
.. //depot/projects/vap/sys/dev/acpica/acpi_hpet.h#1 branch
.. //depot/projects/vap/sys/dev/amr/amr.c#7 integrate
.. //depot/projects/vap/sys/dev/amr/amrreg.h#6 integrate
.. //depot/projects/vap/sys/dev/amr/amrvar.h#7 integrate
.. //depot/projects/vap/sys/dev/an/if_an.c#6 integrate
.. //depot/projects/vap/sys/dev/an/if_an_pci.c#6 integrate
.. //depot/projects/vap/sys/dev/an/if_anreg.h#5 integrate
.. //depot/projects/vap/sys/dev/ath/if_ath.c#21 edit
.. //depot/projects/vap/sys/dev/bge/if_bge.c#7 integrate
.. //depot/projects/vap/sys/dev/bge/if_bgereg.h#7 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_adapter.h#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/sys/cxgb_support.c#2 integrate
.. //depot/projects/vap/sys/dev/cxgb/sys/mvec.h#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#2 integrate
.. //depot/projects/vap/sys/dev/drm/drm_drv.c#5 integrate
.. //depot/projects/vap/sys/dev/gem/if_gem.c#6 integrate
.. //depot/projects/vap/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate
.. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#7 integrate
.. //depot/projects/vap/sys/dev/mii/amphy.c#5 integrate
.. //depot/projects/vap/sys/dev/mii/brgphy.c#5 integrate
.. //depot/projects/vap/sys/dev/mii/miidevs#5 integrate
.. //depot/projects/vap/sys/dev/mii/nsphy.c#5 integrate
.. //depot/projects/vap/sys/dev/mii/nsphyter.c#1 branch
.. //depot/projects/vap/sys/dev/mii/nsphyterreg.h#1 branch
.. //depot/projects/vap/sys/dev/msk/if_msk.c#4 integrate
.. //depot/projects/vap/sys/dev/mxge/if_mxge.c#3 integrate
.. //depot/projects/vap/sys/dev/mxge/if_mxge_var.h#3 integrate
.. //depot/projects/vap/sys/dev/mxge/mxge_lro.c#3 integrate
.. //depot/projects/vap/sys/dev/mxge/mxge_mcp.h#3 integrate
.. //depot/projects/vap/sys/dev/mxge/mxge_rss_eth_z8e.c#1 branch
.. //depot/projects/vap/sys/dev/mxge/mxge_rss_ethp_z8e.c#1 branch
.. //depot/projects/vap/sys/dev/mxge/rss_eth_z8e.h#1 branch
.. //depot/projects/vap/sys/dev/mxge/rss_ethp_z8e.h#1 branch
.. //depot/projects/vap/sys/dev/nfe/if_nfe.c#3 integrate
.. //depot/projects/vap/sys/dev/pci/pci_user.c#7 integrate
.. //depot/projects/vap/sys/dev/re/if_re.c#7 integrate
.. //depot/projects/vap/sys/dev/sf/if_sf.c#1 branch
.. //depot/projects/vap/sys/dev/sf/if_sfreg.h#1 branch
.. //depot/projects/vap/sys/dev/sf/starfire_rx.h#1 branch
.. //depot/projects/vap/sys/dev/sf/starfire_tx.h#1 branch
.. //depot/projects/vap/sys/dev/stge/if_stge.c#4 integrate
.. //depot/projects/vap/sys/dev/syscons/syscons.c#7 integrate
.. //depot/projects/vap/sys/dev/usb/ehci.c#7 integrate
.. //depot/projects/vap/sys/dev/usb/if_udav.c#7 integrate
.. //depot/projects/vap/sys/dev/usb/uark.c#3 integrate
.. //depot/projects/vap/sys/dev/usb/uftdi.c#6 integrate
.. //depot/projects/vap/sys/dev/usb/uftdireg.h#3 integrate
.. //depot/projects/vap/sys/dev/wpi/if_wpi.c#5 integrate
.. //depot/projects/vap/sys/fs/cd9660/cd9660_vfsops.c#4 integrate
.. //depot/projects/vap/sys/fs/coda/cnode.h#3 integrate
.. //depot/projects/vap/sys/fs/coda/coda_namecache.h#3 integrate
.. //depot/projects/vap/sys/fs/coda/coda_psdev.c#3 integrate
.. //depot/projects/vap/sys/fs/coda/coda_vfsops.c#4 integrate
.. //depot/projects/vap/sys/fs/coda/coda_vnops.c#4 integrate
.. //depot/projects/vap/sys/fs/fifofs/fifo_vnops.c#7 integrate
.. //depot/projects/vap/sys/fs/hpfs/hpfs_subr.h#4 integrate
.. //depot/projects/vap/sys/fs/hpfs/hpfs_vfsops.c#7 integrate
.. //depot/projects/vap/sys/fs/msdosfs/msdosfs_denode.c#6 integrate
.. //depot/projects/vap/sys/fs/ntfs/ntfs_subr.c#7 integrate
.. //depot/projects/vap/sys/fs/nullfs/null_vnops.c#7 integrate
.. //depot/projects/vap/sys/fs/nwfs/nwfs_node.c#7 integrate
.. //depot/projects/vap/sys/fs/smbfs/smbfs_node.c#7 integrate
.. //depot/projects/vap/sys/fs/udf/udf_vfsops.c#7 integrate
.. //depot/projects/vap/sys/fs/unionfs/union_subr.c#7 integrate
.. //depot/projects/vap/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 integrate
.. //depot/projects/vap/sys/gnu/fs/reiserfs/reiserfs_inode.c#4 integrate
.. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#3 integrate
.. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#3 integrate
.. //depot/projects/vap/sys/i386/i386/pmap.c#7 integrate
.. //depot/projects/vap/sys/i386/isa/clock.c#6 integrate
.. //depot/projects/vap/sys/kern/genassym.sh#3 integrate
.. //depot/projects/vap/sys/kern/init_sysent.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_cpu.c#5 integrate
.. //depot/projects/vap/sys/kern/kern_descrip.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_jail.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_lock.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_mib.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_rwlock.c#4 integrate
.. //depot/projects/vap/sys/kern/kern_shutdown.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_time.c#6 integrate
.. //depot/projects/vap/sys/kern/sched_ule.c#7 integrate
.. //depot/projects/vap/sys/kern/subr_bus.c#7 integrate
.. //depot/projects/vap/sys/kern/subr_sleepqueue.c#6 integrate
.. //depot/projects/vap/sys/kern/syscalls.c#7 integrate
.. //depot/projects/vap/sys/kern/syscalls.master#7 integrate
.. //depot/projects/vap/sys/kern/systrace_args.c#4 integrate
.. //depot/projects/vap/sys/kern/tty_pty.c#6 integrate
.. //depot/projects/vap/sys/kern/uipc_mbuf.c#6 integrate
.. //depot/projects/vap/sys/kern/uipc_shm.c#2 integrate
.. //depot/projects/vap/sys/kern/uipc_usrreq.c#7 integrate
.. //depot/projects/vap/sys/kern/vfs_aio.c#7 integrate
.. //depot/projects/vap/sys/kern/vfs_bio.c#7 integrate
.. //depot/projects/vap/sys/kern/vfs_default.c#7 integrate
.. //depot/projects/vap/sys/kern/vfs_mount.c#7 integrate
.. //depot/projects/vap/sys/kern/vfs_subr.c#7 integrate
.. //depot/projects/vap/sys/modules/cxgb/cxgb/Makefile#2 integrate
.. //depot/projects/vap/sys/modules/mii/Makefile#5 integrate
.. //depot/projects/vap/sys/modules/mxge/Makefile#3 integrate
.. //depot/projects/vap/sys/modules/mxge/mxge_rss_eth_z8e/Makefile#1 branch
.. //depot/projects/vap/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile#1 branch
.. //depot/projects/vap/sys/modules/sf/Makefile#5 integrate
.. //depot/projects/vap/sys/net/if_bridge.c#4 integrate
.. //depot/projects/vap/sys/netgraph/netflow/netflow.c#6 integrate
.. //depot/projects/vap/sys/netgraph/netflow/ng_netflow.c#6 integrate
.. //depot/projects/vap/sys/netgraph/ng_ppp.c#5 integrate
.. //depot/projects/vap/sys/netgraph/ng_pred1.c#3 integrate
.. //depot/projects/vap/sys/netinet/in.c#6 integrate
.. //depot/projects/vap/sys/netinet/ip_fw.h#6 integrate
.. //depot/projects/vap/sys/netinet/ip_fw2.c#7 integrate
.. //depot/projects/vap/sys/netinet/ip_options.c#3 integrate
.. //depot/projects/vap/sys/netinet/tcp_usrreq.c#7 integrate
.. //depot/projects/vap/sys/netinet6/in6.c#7 integrate
.. //depot/projects/vap/sys/netinet6/in6_src.c#6 integrate
.. //depot/projects/vap/sys/netinet6/ip6_output.c#7 integrate
.. //depot/projects/vap/sys/netinet6/ip6_var.h#6 integrate
.. //depot/projects/vap/sys/netinet6/raw_ip6.c#7 integrate
.. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#6 integrate
.. //depot/projects/vap/sys/netncp/ncp_conn.c#5 integrate
.. //depot/projects/vap/sys/netsmb/smb_conn.c#5 integrate
.. //depot/projects/vap/sys/nfs4client/nfs4_idmap.c#3 integrate
.. //depot/projects/vap/sys/nfs4client/nfs4_vnops.c#7 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_node.c#6 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_subs.c#7 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_vnops.c#7 integrate
.. //depot/projects/vap/sys/nfsserver/nfs_srvsubs.c#7 integrate
.. //depot/projects/vap/sys/pci/amdsmb.c#3 integrate
.. //depot/projects/vap/sys/pci/if_sf.c#6 delete
.. //depot/projects/vap/sys/pci/if_sfreg.h#5 delete
.. //depot/projects/vap/sys/pci/nfsmb.c#3 integrate
.. //depot/projects/vap/sys/powerpc/powermac/ata_kauai.c#6 integrate
.. //depot/projects/vap/sys/security/audit/audit_bsm.c#3 integrate
.. //depot/projects/vap/sys/sparc64/conf/GENERIC#7 integrate
.. //depot/projects/vap/sys/sys/buf.h#7 integrate
.. //depot/projects/vap/sys/sys/bus.h#6 integrate
.. //depot/projects/vap/sys/sys/event.h#6 integrate
.. //depot/projects/vap/sys/sys/lockmgr.h#7 integrate
.. //depot/projects/vap/sys/sys/mbuf.h#7 integrate
.. //depot/projects/vap/sys/sys/param.h#7 integrate
.. //depot/projects/vap/sys/sys/priv.h#4 integrate
.. //depot/projects/vap/sys/sys/signal.h#5 integrate
.. //depot/projects/vap/sys/sys/syscall.h#7 integrate
.. //depot/projects/vap/sys/sys/syscall.mk#7 integrate
.. //depot/projects/vap/sys/sys/sysproto.h#7 integrate
.. //depot/projects/vap/sys/sys/time.h#6 integrate
.. //depot/projects/vap/sys/sys/user.h#7 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_snapshot.c#7 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_vfsops.c#7 integrate
.. //depot/projects/vap/sys/ufs/ffs/ffs_vnops.c#7 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufs_extattr.c#7 integrate
.. //depot/projects/vap/tools/build/Makefile#3 integrate
.. //depot/projects/vap/tools/build/mk/OptionalObsoleteFiles.inc#3 integrate
.. //depot/projects/vap/tools/build/options/WITHOUT_FORTRAN#3 delete
.. //depot/projects/vap/tools/regression/lib/msun/Makefile#4 integrate
.. //depot/projects/vap/tools/regression/lib/msun/test-exponential.c#1 branch
.. //depot/projects/vap/tools/regression/lib/msun/test-exponential.t#1 branch
.. //depot/projects/vap/tools/regression/posixshm/Makefile#1 branch
.. //depot/projects/vap/tools/regression/posixshm/posixshm.c#1 branch
.. //depot/projects/vap/tools/regression/posixshm/posixshm.t#1 branch
.. //depot/projects/vap/tools/regression/posixshm/test.c#1 branch
.. //depot/projects/vap/tools/regression/posixshm/test.h#1 branch
.. //depot/projects/vap/tools/sched/schedgraph.py#4 integrate
.. //depot/projects/vap/tools/tools/aac/aac_checkq.c#3 integrate
.. //depot/projects/vap/usr.bin/fstat/Makefile#3 integrate
.. //depot/projects/vap/usr.bin/fstat/zfs/Makefile#3 integrate
.. //depot/projects/vap/usr.bin/mklocale/mklocale.1#3 integrate
.. //depot/projects/vap/usr.bin/mklocale/yacc.y#3 integrate
.. //depot/projects/vap/usr.bin/mt/mt.1#3 integrate
.. //depot/projects/vap/usr.bin/procstat/procstat_files.c#2 integrate
.. //depot/projects/vap/usr.bin/systat/cmds.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/convtbl.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/devs.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/fetch.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/icmp.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/icmp6.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/iostat.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/ip.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/ip6.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/keyboard.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/main.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/mbufs.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/netcmds.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/netstat.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/pigs.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/swap.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/tcp.c#3 integrate
.. //depot/projects/vap/usr.bin/systat/vmstat.c#3 integrate
.. //depot/projects/vap/usr.bin/tar/bsdtar.1#4 integrate
.. //depot/projects/vap/usr.bin/tar/bsdtar.c#4 integrate
.. //depot/projects/vap/usr.bin/top/machine.c#4 integrate
.. //depot/projects/vap/usr.bin/vmstat/vmstat.c#4 integrate
.. //depot/projects/vap/usr.bin/xargs/xargs.1#3 integrate
.. //depot/projects/vap/usr.sbin/adduser/adduser.8#3 integrate
.. //depot/projects/vap/usr.sbin/adduser/adduser.sh#3 integrate
.. //depot/projects/vap/usr.sbin/iostat/iostat.c#4 integrate
.. //depot/projects/vap/usr.sbin/pw/pw.8#3 integrate
.. //depot/projects/vap/usr.sbin/setfmac/setfmac.c#3 integrate
.. //depot/projects/vap/usr.sbin/sysinstall/menus.c#4 integrate

Differences ...

==== //depot/projects/vap/LOCKS#3 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/LOCKS,v 1.3 2006/01/13 06:51:43 ru Exp $
+$FreeBSD: src/LOCKS,v 1.4 2008/01/24 22:07:03 cperciva Exp $
 
 This file documents formal review/approval requirements that have been
 approved by core.
@@ -10,3 +10,4 @@
 src/*	RELENG_4_*	Requires Security Officer approval.
 src/*	RELENG_5_*	Requires Security Officer approval.
 src/*	RELENG_6_*	Requires Security Officer approval.
+src/*	RELENG_7_*	Requires Security Officer approval.

==== //depot/projects/vap/MAINTAINERS#3 (text+ko) ====

@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.145 2007/05/23 21:47:19 jfv Exp $
+$FreeBSD: src/MAINTAINERS,v 1.146 2008/01/26 21:58:52 brueffer Exp $
 
 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
@@ -33,7 +33,6 @@
 ahc(4)		gibbs	Pre-commit review requested.
 ahd(4)		gibbs	Pre-commit review requested.
 NEWCARD		imp	Pre-commit review requested.
-OLDCARD		imp	Pre-commit review requested.
 pci bus		imp,jhb	Pre-commit review requested.
 cdboot		jhb	Pre-commit review requested.
 pxeboot		jhb	Pre-commit review requested.

==== //depot/projects/vap/Makefile.inc1#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.591 2007/12/04 12:55:27 yar Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.596 2008/01/23 22:21:36 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -227,7 +227,7 @@
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		-DWITHOUT_FORTRAN -DWITHOUT_GDB
+		-DWITHOUT_GDB
 
 # world stage
 WMAKEENV=	${CROSSENV} \
@@ -841,8 +841,8 @@
 # legacy: Build compatibility shims for the next three targets
 #
 legacy:
-.if ${BOOTSTRAPPING} < 503000
-	@echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \
+.if ${BOOTSTRAPPING} < 600034 && ${BOOTSTRAPPING} != 0
+	@echo "ERROR: Source upgrades from versions prior to 6.0 not supported."; \
 	false
 .endif
 .for _tool in tools/build
@@ -871,26 +871,6 @@
 .endif
 .endif
 
-.if ${BOOTSTRAPPING} < 600029
-_texinfo=	gnu/usr.bin/texinfo
-.endif
-
-.if ${BOOTSTRAPPING} < 600015
-_cap_mkdb=	usr.bin/cap_mkdb
-.endif
-
-.if ${BOOTSTRAPPING} < 600018
-_colldef=	usr.bin/colldef
-.endif
-
-.if ${BOOTSTRAPPING} < 600017
-_gencat=	usr.bin/gencat
-.endif
-
-.if ${BOOTSTRAPPING} < 600016
-_mklocale=	usr.bin/mklocale
-.endif
-
 .if ${BOOTSTRAPPING} < 700018
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -900,28 +880,23 @@
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
-.if ${BOOTSTRAPPING} < 600020
-_pwd_mkdb=	usr.sbin/pwd_mkdb
+.if ${BOOTSTRAPPING} < 800013
+_mklocale=	usr.bin/mklocale
 .endif
 
 bootstrap-tools:
 .for _tool in \
+    ${_mklocale} \
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
-    ${_texinfo} \
-    ${_cap_mkdb} \
-    ${_colldef} \
-    ${_gencat} \
     usr.bin/lorder \
     usr.bin/makewhatis \
-    ${_mklocale} \
     usr.bin/rpcgen \
     usr.bin/xinstall \
     ${_gensnmptree} \
     usr.sbin/config \
-    ${_crunchgen} \
-    ${_pwd_mkdb}
+    ${_crunchgen}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \

==== //depot/projects/vap/ObsoleteFiles.inc#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.125 2008/01/11 13:41:31 jhb Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.127 2008/01/26 20:23:25 brueffer Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20080126: oldcard.4 removal
+OLD_FILES+=usr/share/man/man4/card.4.gz
+OLD_FILES+=usr/share/man/man4/oldcard.4.gz
+# 20080122: Removed from the tree
+OLD_FILES+=usr/share/man/man9/BUF_REFCNT.9.gz
 # 20080108: Moved to section 2
 OLD_FILES+=usr/share/man/man3/shm_open.3.gz
 OLD_FILES+=usr/share/man/man3/shm_unlink.3.gz

==== //depot/projects/vap/UPDATING#3 (text+ko) ====

@@ -19,7 +19,27 @@
 	related kernel options, INVARIANTS, malloc debugging flags
 	in userland, and various verbose features in the kernel.  Many
 	developers choose to disable these features on build machines
-	to maximize performance.
+	to maximize performance.  (To disable malloc debugging, run
+	ln -s aj /etc/malloc.conf.)
+
+20080126:
+	The fts(3) structures have been changed to use adequate
+	integer types for their members and so to be able to cope
+	with huge file trees.  The old fts(3) ABI is preserved
+	through symbol versioning in libc, so third-party binaries
+	using fts(3) should still work, although they will not take
+	advantage of the extended types.  At the same time, some
+	third-party software might fail to build after this change
+	due to unportable assumptions made in its source code about
+	fts(3) structure members.  Such software should be fixed
+	by its vendor or, in the worst case, in the ports tree.
+	FreeBSD_version 800015 marks this change for the unlikely
+	case that a portable fix is impossible.
+
+20080123:
+	To upgrade to -current after this date, you must be running
+	FreeBSD not older than 6.0-RELEASE.  Upgrading to -current
+	from 5.x now requires a stop over at RELENG_6 or RELENG_7 systems.
 
 20071128:
 	The ADAPTIVE_GIANT kernel option has been retired because its
@@ -949,4 +969,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.513 2007/11/28 13:04:11 matteo Exp $
+$FreeBSD: src/UPDATING,v 1.517 2008/01/26 17:09:39 yar Exp $

==== //depot/projects/vap/contrib/top/display.c#3 (text+ko) ====

@@ -8,7 +8,7 @@
  *  Copyright (c) 1984, 1989, William LeFebvre, Rice University
  *  Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University
  *
- * $FreeBSD: src/contrib/top/display.c,v 1.9 2005/05/19 13:34:19 keramida Exp $
+ * $FreeBSD: src/contrib/top/display.c,v 1.10 2008/01/18 01:43:13 peter Exp $
  */
 
 /*
@@ -78,8 +78,10 @@
 static int *lmemory;
 static int *lswap;
 
+static int num_cpus;
 static int *cpustate_columns;
 static int cpustate_total_length;
+static int cpustates_column;
 
 static enum { OFF, ON, ERASE } header_status = ON;
 
@@ -87,6 +89,29 @@
 static void summary_format();
 static void line_update();
 
+int  x_lastpid =	10;
+int  y_lastpid =	0;
+int  x_loadave =	33;
+int  x_loadave_nompid =	15;
+int  y_loadave =	0;
+int  x_procstate =	0;
+int  y_procstate =	1;
+int  x_brkdn =		15;
+int  y_brkdn =		1;
+int  x_mem =		5;
+int  y_mem =		3;
+int  x_swap =		6;
+int  y_swap =		4;
+int  y_message =	5;
+int  x_header =		0;
+int  y_header =		6;
+int  x_idlecursor =	0;
+int  y_idlecursor =	5;
+int  y_procs =		7;
+
+int  y_cpustates =	2;
+int  Header_lines =	7;
+
 int display_resize()
 
 {
@@ -138,6 +163,12 @@
 
     /* call resize to do the dirty work */
     lines = display_resize();
+    num_cpus = statics->ncpus;
+    cpustates_column = 5;	/* CPU: */
+    if (num_cpus != 1)
+    cpustates_column += 2;	/* CPU 0: */
+    for (i = num_cpus; i > 9; i /= 10)
+	cpustates_column++;
 
     /* only do the rest if we need to */
     if (lines > -1)
@@ -153,7 +184,7 @@
 	num_swap = string_count(swap_names);
 	lswap = (int *)malloc(num_swap * sizeof(int));
 	num_cpustates = string_count(cpustate_names);
-	lcpustates = (int *)malloc(num_cpustates * sizeof(int));
+	lcpustates = (int *)malloc(num_cpustates * sizeof(int) * num_cpus);
 	cpustate_columns = (int *)malloc(num_cpustates * sizeof(int));
 
 	memory_names = statics->memory_names;
@@ -365,14 +396,13 @@
     }
 }
 
+#ifdef no_more
 /*
  *  *_cpustates(states, names) - print the cpu state percentages
  *
  *  Assumptions:  cursor is on the PREVIOUS line
  */
 
-static int cpustates_column;
-
 /* cpustates_tag() calculates the correct tag to use to label the line */
 
 char *cpustates_tag()
@@ -398,6 +428,7 @@
     cpustates_column = strlen(use);
     return(use);
 }
+#endif
 
 i_cpustates(states)
 
@@ -406,11 +437,18 @@
 {
     register int i = 0;
     register int value;
-    register char **names = cpustate_names;
+    register char **names;
     register char *thisname;
+    int cpu;
+
+for (cpu = 0; cpu < num_cpus; cpu++) {
+    names = cpustate_names;
 
     /* print tag and bump lastline */
-    printf("\n%s", cpustates_tag());
+    if (num_cpus == 1)
+	printf("\nCPU: ");
+    else
+	printf("\nCPU %d: ", cpu);
     lastline++;
 
     /* now walk thru the names and print the line */
@@ -423,14 +461,15 @@
 
 	    /* if percentage is >= 1000, print it as 100% */
 	    printf((value >= 1000 ? "%s%4.0f%% %s" : "%s%4.1f%% %s"),
-		   i++ == 0 ? "" : ", ",
+		   (i++ % num_cpustates) == 0 ? "" : ", ",
 		   ((float)value)/10.,
 		   thisname);
 	}
     }
+}
 
     /* copy over values into "last" array */
-    memcpy(lcpustates, states, num_cpustates * sizeof(int));
+    memcpy(lcpustates, states, num_cpustates * sizeof(int) * num_cpus);
 }
 
 u_cpustates(states)
@@ -439,14 +478,18 @@
 
 {
     register int value;
-    register char **names = cpustate_names;
+    register char **names;
     register char *thisname;
     register int *lp;
     register int *colp;
+    int cpu;
+
+for (cpu = 0; cpu < num_cpus; cpu++) {
+    names = cpustate_names;
 
-    Move_to(cpustates_column, y_cpustates);
-    lastline = y_cpustates;
-    lp = lcpustates;
+    Move_to(cpustates_column, y_cpustates + cpu);
+    lastline = y_cpustates + cpu;
+    lp = lcpustates + (cpu * num_cpustates);
     colp = cpustate_columns;
 
     /* we could be much more optimal about this */
@@ -458,8 +501,8 @@
 	    if (*lp != *states)
 	    {
 		/* yes, move and change */
-		Move_to(cpustates_column + *colp, y_cpustates);
-		lastline = y_cpustates;
+		Move_to(cpustates_column + *colp, y_cpustates + cpu);
+		lastline = y_cpustates + cpu;
 
 		/* retrieve value and remember it */
 		value = *states;
@@ -479,30 +522,39 @@
 	colp++;
     }
 }
+}
 
 z_cpustates()
 
 {
     register int i = 0;
-    register char **names = cpustate_names;
+    register char **names;
     register char *thisname;
     register int *lp;
+    int cpu;
+
+for (cpu = 0; cpu < num_cpus; cpu++) {
+    names = cpustate_names;
 
     /* show tag and bump lastline */
-    printf("\n%s", cpustates_tag());
+    if (num_cpus == 1)
+	printf("\nCPU: ");
+    else
+	printf("\nCPU %d: ", cpu);
     lastline++;
 
     while ((thisname = *names++) != NULL)
     {
 	if (*thisname != '\0')
 	{
-	    printf("%s    %% %s", i++ == 0 ? "" : ", ", thisname);
+	    printf("%s    %% %s", (i++ % num_cpustates) == 0 ? "" : ", ", thisname);
 	}
     }
+}
 
     /* fill the "last" array with all -1s, to insure correct updating */
     lp = lcpustates;
-    i = num_cpustates;
+    i = num_cpustates * num_cpus;
     while (--i >= 0)
     {
 	*lp++ = -1;

==== //depot/projects/vap/contrib/top/layout.h#3 (text+ko) ====

@@ -4,26 +4,28 @@
  *  This file defines the locations on tne screen for various parts of the
  *  display.  These definitions are used by the routines in "display.c" for
  *  cursor addressing.
+ *
+ * $FreeBSD: src/contrib/top/layout.h,v 1.3 2008/01/18 01:43:13 peter Exp $
  */
 
-#define  x_lastpid	10
-#define  y_lastpid	0
-#define  x_loadave	33
-#define  x_loadave_nompid	15
-#define  y_loadave	0
-#define  x_procstate	0
-#define  y_procstate	1
-#define  x_brkdn	15
-#define  y_brkdn	1
-#define  x_mem		5
-#define  y_mem		3
-#define  x_swap		6
-#define  y_swap		4
-#define  y_message	5
-#define  x_header	0
-#define  y_header	6
-#define  x_idlecursor	0
-#define  y_idlecursor	5
-#define  y_procs	7
+extern int  x_lastpid;		/* 10 */
+extern int  y_lastpid;		/* 0 */
+extern int  x_loadave;		/* 33 */
+extern int  x_loadave_nompid;	/* 15 */
+extern int  y_loadave;		/* 0 */
+extern int  x_procstate;	/* 0 */
+extern int  y_procstate;	/* 1 */
+extern int  x_brkdn;		/* 15 */
+extern int  y_brkdn;		/* 1 */
+extern int  x_mem;		/* 5 */
+extern int  y_mem;		/* 3 */
+extern int  x_swap;		/* 6 */
+extern int  y_swap;		/* 4 */
+extern int  y_message;		/* 5 */
+extern int  x_header;		/* 0 */
+extern int  y_header;		/* 6 */
+extern int  x_idlecursor;	/* 0 */
+extern int  y_idlecursor;	/* 5 */
+extern int  y_procs;		/* 7 */
 
-#define  y_cpustates	2
+extern int  y_cpustates;	/* 2 */

==== //depot/projects/vap/contrib/top/machine.h#3 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/contrib/top/machine.h,v 1.9 2007/05/04 15:42:58 rafan Exp $
+ * $FreeBSD: src/contrib/top/machine.h,v 1.10 2008/01/18 01:43:13 peter Exp $
  */
 
 /*
@@ -20,6 +20,7 @@
 #ifdef ORDER
     char **order_names;
 #endif
+    int ncpus;
 };
 
 /*
@@ -43,6 +44,8 @@
     int    *memory;
     int    *swap;
     struct timeval boottime;
+    unsigned long cpumask;	/* bitfield of cpu states represented */
+    int    ncpus;
 };
 
 /* cpu_states is an array of percentages * 10.  For example, 

==== //depot/projects/vap/contrib/top/top.c#4 (text+ko) ====

@@ -13,7 +13,7 @@
  *  Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
  *  Copyright (c) 1996, William LeFebvre, Group sys Consulting
  *
- * $FreeBSD: src/contrib/top/top.c,v 1.24 2008/01/09 18:06:24 obrien Exp $
+ * $FreeBSD: src/contrib/top/top.c,v 1.25 2008/01/18 01:43:13 peter Exp $
  */
 
 /*
@@ -66,6 +66,7 @@
 extern int overstrike;
 
 static int fmt_flags = 0;
+int pcpu_stats = No;
 
 /* signal handling routines */
 sigret_t leave();
@@ -282,7 +283,7 @@
 	    optind = 1;
 	}
 
-	while ((i = getopt(ac, av, "CSIHabijnquvs:d:U:m:o:t")) != EOF)
+	while ((i = getopt(ac, av, "CSIHPabijnpquvs:d:U:m:o:t")) != EOF)
 	{
 	    switch(i)
 	    {
@@ -407,6 +408,14 @@
 		ps.jail = !ps.jail;
 		break;
 
+	      case 'P':
+		pcpu_stats = Yes;
+		break;
+
+	      case 'p':
+		pcpu_stats = No;
+		break;
+
 	      default:
 		fprintf(stderr,
 "Top version %s\n"

==== //depot/projects/vap/contrib/top/top.h#3 (text+ko) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/contrib/top/top.h,v 1.4 2007/04/14 10:16:51 stas Exp $
+ * $FreeBSD: src/contrib/top/top.h,v 1.5 2008/01/18 01:43:13 peter Exp $
  */
 /*
  *  Top - a top users display for Berkeley Unix
@@ -11,7 +11,7 @@
 #define VERSION		3
 
 /* Number of lines of header information on the standard screen */
-#define Header_lines	7
+extern int Header_lines;	/* 7 */
 
 /* Maximum number of columns allowed for display */
 #define MAX_COLS	128
@@ -45,3 +45,5 @@
 #define FMT_SHOWARGS 0x00000001
 
 extern enum displaymodes displaymode;
+
+extern int pcpu_stats;

==== //depot/projects/vap/etc/defaults/rc.conf#4 (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.322 2008/01/12 20:52:30 maxim Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.326 2008/01/27 15:15:11 mtm Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -119,6 +119,10 @@
 firewall_nologports="135-139,445 1026,1027 1433,1434" # List of TCP/UDP ports
 				#  for which denied incoming packets are not
 				#  logged.
+firewall_nat_enable="NO"	# Enable kernel NAT (if firewall_enable == YES)
+firewall_nat_interface=""	# Public interface or IPaddress to use
+firewall_nat_flags=""		# Additional configuration parameters
+dummynet_enable="NO"		# Load the dummynet(4) module
 ip_portrange_first="NO"		# Set first dynamically allocated port
 ip_portrange_last="NO"		# Set last dynamically allocated port
 ike_enable="NO"			# Enable IKE daemon (usually racoon or isakmpd)
@@ -236,7 +240,7 @@
 #
 kerberos5_server_enable="NO"	# Run a kerberos 5 master server (or NO).
 kerberos5_server="/usr/libexec/kdc"	# path to kerberos 5 KDC
-kerberos5_server_flags=""	# Additional flags to the kerberos 5 server
+kerberos5_server_flags="--detach"	# Additional flags to the kerberos 5 server
 kadmind5_server_enable="NO"	# Run kadmind (or NO)
 kadmind5_server="/usr/libexec/kadmind"	# path to kerberos 5 admin daemon
 kpasswdd_server_enable="NO"	# Run kpasswdd (or NO)
@@ -557,7 +561,7 @@
 watchdogd_enable="NO"	# Start the software watchdog daemon
 devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules" # Files containing
 							    # devfs(8) rules.
-devfs_system_ruleset=""	# The name of a ruleset to apply to /dev
+devfs_system_ruleset=""	# The name (NOT number) of a ruleset to apply to /dev
 devfs_set_rulesets=""	# A list of /mount/dev=ruleset_name settings to
 			# apply (must be mounted already, i.e. fstab(5))
 performance_cx_lowest="HIGH"	# Online CPU idle state

==== //depot/projects/vap/etc/devd.conf#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.38 2007/06/21 22:50:36 njl Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.39 2008/01/26 13:50:38 mtm Exp $
 #
 # Refer to devd.conf(5) and devd(8) man pages for the details on how to
 # run and configure devd.
@@ -53,7 +53,7 @@
 	match "system"		"IFNET";
 	match "type"		"LINK_UP";
 	media-type		"ethernet";
-	action "/etc/rc.d/dhclient start $subsystem";
+	action "/etc/rc.d/dhclient quietstart $subsystem";
 };
 
 #
@@ -73,7 +73,7 @@
 	match "system"		"IFNET";
 	match "type"		"LINK_UP";
 	media-type		"802.11";
-	action "/etc/rc.d/dhclient start $subsystem";
+	action "/etc/rc.d/dhclient quietstart $subsystem";
 };
 
 # An entry like this might be in a different file, but is included here
@@ -91,11 +91,11 @@
 # When a USB Bluetooth dongle appears activate it
 attach 100 {
 	device-name "ubt[0-9]+";
-	action "/etc/rc.d/bluetooth start $device-name";
+	action "/etc/rc.d/bluetooth quietstart $device-name";
 };
 detach 100 {
 	device-name "ubt[0-9]+";
-	action "/etc/rc.d/bluetooth stop $device-name";
+	action "/etc/rc.d/bluetooth quietstop $device-name";
 };
 
 # When a USB keyboard arrives, attach it as the console keyboard.
@@ -112,7 +112,7 @@
 # stops automatically (actually it bombs :) when the device disappears.
 attach 100 {
 	device-name "ums[0-9]+";
-	action "/etc/rc.d/moused start $device-name";
+	action "/etc/rc.d/moused quietstart $device-name";
 };
 
 # Firmware download into the ActiveWire board. After the firmware download is

==== //depot/projects/vap/etc/netstart#3 (text+ko) ====

@@ -24,7 +24,7 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list