From owner-p4-projects@FreeBSD.ORG Mon Sep 14 18:14:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B9391065679; Mon, 14 Sep 2009 18:14:20 +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 F2F14106566B for ; Mon, 14 Sep 2009 18:14:19 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E18EB8FC1A for ; Mon, 14 Sep 2009 18:14:19 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8EIEJqN054491 for ; Mon, 14 Sep 2009 18:14:19 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8EIEI1I054489 for perforce@freebsd.org; Mon, 14 Sep 2009 18:14:18 GMT (envelope-from trasz@freebsd.org) Date: Mon, 14 Sep 2009 18:14:18 GMT Message-Id: <200909141814.n8EIEI1I054489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 168540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Sep 2009 18:14:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=168540 Change 168540 by trasz@trasz_anger on 2009/09/14 18:14:17 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#36 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/compat/opensolaris/include/assert.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/head/assert.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/Makefile#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/NETWORKING#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/addswap#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/auto_linklocal#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/defaultroute#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/devd#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/faith#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ip6addrctl#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/mroute6d#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netif#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/netoptions#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/network_ipv6#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/ppp#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/route6d#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/routed#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/routing#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/rtadvd#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/stf#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.d/sysctl#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/Makefile#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/archive_read_support_format_iso9660.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_compat_zip.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isojoliet_bz2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libarchive/test/test_read_format_isorr_bz2.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/Versions.def#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/net/getifaddrs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdtime/localtime.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libkvm/kvm_proc.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libradius/libradius.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libradius/radlib.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libradius/radlib.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libradius/radlib_private.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/net.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/nfs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/rpc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/relnotes/article.sgml#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/picobsd/bridge/crunch.conf#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/mirror/gmirror.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/af_inet6.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/af_nd6.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sbin/ifconfig/ifconfig.8#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/scsi_target/scsi_target.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/scsi_target/scsi_target.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/dpms.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ed.4#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/inet6.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ips.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/man4.i386/dpms.4#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/syscons.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/textdump.4#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/device.hints.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/rc.conf.5#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/monetdef/zh_CN.GB18030.src#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/monetdef/zh_CN.GB2312.src#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/australasia#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/identcpu.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/initcpu.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/msi.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/NOTES#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/param.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/specialreg.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/param.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/Makefile.inc#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_cd.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_target.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#34 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_misc.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/freebsd32/freebsd32_proto.h#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_ioctl.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_misc.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#39 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#49 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.amd64#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.i386#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options#33 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/options.amd64#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/acpica_prep.sh#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslcompiler.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslcompiler.l#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/asldefine.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslfiles.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslglobal.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslload.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/asllookup.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslmain.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslmap.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/compiler/asltypes.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/x86emu/x86emu.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/x86emu/x86emu.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/x86emu/x86emu_regs.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/x86emu/x86emu_util.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aac/aac.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ae/if_ae.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp_i810.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/amdtemp/amdtemp.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/amr/amr.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/asmc/asmc.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/asmc/asmcvar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-acerlabs.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-marvell.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ah_osdep.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/ath_hal/ah_eeprom_v3.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bce/if_bce.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_sge.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dpms/dpms.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/drm_pciids.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_em.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_igb.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ep/if_epreg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/s3_pci.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vesa.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vesa.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fb/vga.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fxp/if_fxp.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hptiop/hptiop.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ichwd/ichwd.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iir/iir.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ixgbe/ixgbe.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mpt/mpt_raid.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_msk.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pci_user.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pcireg.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/pci/pcivar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#28 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/daemon/daemon_saver.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scterm-teken.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/scvesactl.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/syscons/syscons.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rum.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_rumreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/wlan/if_urtw.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/wi/if_wi.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/fifofs/fifo_vnops.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/msdosfs/msdosfs_conv.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clnode.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsclient/nfs_clport.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_dev.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_vfs.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/acpica/acpi_machdep.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/cpufreq/hwpstate.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/identcpu.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/msi.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/pmap.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/param.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/pc/vesa.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/specialreg.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/xen-os.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/dpms.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/isa/vesa.c#5 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/locore.s#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/xen/pmap.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/param.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_event.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exec.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_jail.c#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_linker.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_lock.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_shutdown.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_sig.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_bus.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_generic.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/sys_pipe.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty.c#27 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_pts.c#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_mqueue.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_socket.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_aio.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#39 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/include/param.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/Makefile#31 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/acpi/acpi/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dpms/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/vesa/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/x86emu/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/bpf.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_vlan.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_action.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_proto.h#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_mcast.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/sctp_pcb.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6.c#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_ifattach.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_proto.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_input.c#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6_nbr.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6_rtr.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netsmb/smb_dev.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsclient/nfs_node.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/nfsserver/nfs_serv.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/include/pc/vesa.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/intpm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pci/intpmreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/conf/GENERIC#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/param.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm_token.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/param.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/ofw_pci.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/psycho.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/schizo.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/jbusppm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/include/_align.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/include/param.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/_sockaddr_storage.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/bus.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/imgact_aout.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#36 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/socket.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/syscallsubr.h#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysproto.h#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_demo.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_subr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/teken/teken_subr_compat.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/unzip/unzip.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/unzip/unzip.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/w/pr_time.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/acpi/acpidb/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/btxld/btxld.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ndp/ndp.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ndp/ndp.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtsold/if.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtsold/rtsold.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtsold/rtsold.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/rtsold/rtsold.h#2 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/Makefile.inc1#17 (text+ko) ==== @@ -1,11 +1,11 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.628 2009/07/14 21:19:13 kan Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.629 2009/09/10 07:37:36 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNO_CLEAN do not clean at all # -DNO_SHARE do not go into share subdir -# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELCONFIG +# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELDEPEND # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel ==== //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#36 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.208 2009/09/03 16:34:20 remko Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.209 2009/09/10 21:42:00 delphij 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,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090909: vesa and dpms promoted to be i386/amd64 common +OLD_FILES+=usr/include/machine/pc/vesa.h +OLD_FILES+=usr/share/man/man4/i386/dpms.4.gz # 20090904: remove lukemftpd OLD_FILES+=usr/libexec/lukemftpd OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz ==== //depot/projects/soc2008/trasz_nfs4acl/etc/defaults/rc.conf#19 (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.359 2009/08/25 19:07:26 delphij Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.360 2009/09/12 22:22:31 hrs Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -196,6 +196,8 @@ ifconfig_lo0="inet 127.0.0.1" # default loopback device configuration. #ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry. #ifconfig_ed0_ipx="ipx 0x00010010" # Sample IPX address family entry. +#ifconfig_ed0_ipv6="inet6 2001:db8:1::1 prefixlen 64" # Sample IPv6 addr entry +#ifconfig_ed0_alias0="inet6 2001:db8:2::1 prefixlen 64" # Sample IPv6 alias #ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0. #wlans_ath0="wlan0" # wlan(4) interfaces for ath0 device #wlandebug_wlan0="scan+auth+assoc" # Set debug flags with wlanddebug(8) @@ -361,9 +363,9 @@ static_routes="" # Set to static route list (or leave empty). natm_static_routes="" # Set to static route list for NATM (or leave empty). gateway_enable="NO" # Set to YES if this host will be a gateway. -router_enable="NO" # Set to YES to enable a routing daemon. -router="/sbin/routed" # Name of routing daemon to use if enabled. -router_flags="-q" # Flags for routing daemon. +routed_enable="NO" # Set to YES to enable a routing daemon. +routed_program="/sbin/routed" # Name of routing daemon to use if enabled. +routed_flags="-q" # Flags for routing daemon. mrouted_enable="NO" # Do IPv4 multicast routing. mrouted_program="/usr/local/sbin/mrouted" # Name of IPv4 multicast # routing daemon. You need to @@ -418,8 +420,8 @@ icmp_bmcastecho="NO" # respond to broadcast ping packets ### IPv6 options: ### -ipv6_enable="NO" # Set to YES to set up for IPv6. -ipv6_network_interfaces="auto" # List of network interfaces (or "auto"). +ipv6_network_interfaces="none" # List of IPv6 network interfaces + # (or "auto" or "none"). ipv6_defaultrouter="NO" # Set to IPv6 default gateway (or NO). #ipv6_defaultrouter="2002:c058:6301::" # Use this for 6to4 (RFC 3068) ipv6_static_routes="" # Set to static route list (or leave empty). @@ -427,20 +429,19 @@ # route toward loopback interface. #ipv6_route_xxx="fec0:0000:0000:0006:: -prefixlen 64 ::1" ipv6_gateway_enable="NO" # Set to YES if this host will be a gateway. -ipv6_router_enable="NO" # Set to YES to enable an IPv6 routing daemon. -ipv6_router="/usr/sbin/route6d" # Name of IPv6 routing daemon. -ipv6_router_flags="" # Flags to IPv6 routing daemon. -#ipv6_router_flags="-l" # Example for route6d with only IPv6 site local + +route6d_enable="NO" # Set to YES to enable an IPv6 routing daemon. +route6d_program="/usr/sbin/route6d" # Name of IPv6 routing daemon. +route6d_flags="" # Flags to IPv6 routing daemon. +#route6d_flags="-l" # Example for route6d with only IPv6 site local # addrs. -#ipv6_router_flags="-q" # If you want to run a routing daemon on an end +#route6d_flags="-q" # If you want to run a routing daemon on an end # node, you should stop advertisement. #ipv6_network_interfaces="ed0 ep0" # Examples for router # or static configuration for end node. # Choose correct prefix value. #ipv6_prefix_ed0="fec0:0000:0000:0001 fec0:0000:0000:0002" # Examples for rtr. #ipv6_prefix_ep0="fec0:0000:0000:0003 fec0:0000:0000:0004" # Examples for rtr. -#ipv6_ifconfig_ed0="fec0:0:0:5::1 prefixlen 64" # Sample manual assign entry -#ipv6_ifconfig_ed0_alias0="fec0:0:0:5::2 prefixlen 64" # Sample alias entry. ipv6_default_interface="NO" # Default output interface for scoped addrs. # Now this works only for IPv6 link local # multicast addrs. @@ -482,6 +483,7 @@ # for examples ip6addrctl_enable="YES" # Set to YES to enable default address selection ip6addrctl_verbose="NO" # Set to YES to enable verbose configuration messages +ipv6_prefer="NO" # Use IPv6 when both IPv4 and IPv6 can be used ############################################################## ### System console options ################################# ==== //depot/projects/soc2008/trasz_nfs4acl/etc/network.subr#9 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.199 2009/08/27 15:24:26 dougb Exp $ +# $FreeBSD: src/etc/network.subr,v 1.201 2009/09/12 23:01:36 hrs Exp $ # # @@ -31,8 +31,8 @@ # # ifn_start ifn -# Bring up and configure an interface. If some configuration is applied -# print the interface configuration. +# Bring up and configure an interface. If some configuration is +# applied print the interface configuration. # ifn_start() { @@ -45,15 +45,16 @@ ifscript_up ${ifn} && cfg=0 ifconfig_up ${ifn} && cfg=0 ipv4_up ${ifn} && cfg=0 + ipv6_up ${ifn} && cfg=0 ipx_up ${ifn} && cfg=0 - childif_create ${ifn} + childif_create ${ifn} && cfg=0 return $cfg } -# ifn_start ifn -# Shutdown and de-configure an interface. If action is taken print the -# interface name. +# ifn_stop ifn +# Shutdown and de-configure an interface. If action is taken +# print the interface name. # ifn_stop() { @@ -61,13 +62,14 @@ ifn="$1" cfg=1 - [ -z "$ifn" ] && return 1 + [ -z "$ifn" ] && err 1 "ifn_stop called without an interface" ipx_down ${ifn} && cfg=0 + ipv6_down ${ifn} && cfg=0 ipv4_down ${ifn} && cfg=0 ifconfig_down ${ifn} && cfg=0 ifscript_down ${ifn} && cfg=0 - childif_destroy ${ifn} + childif_destroy ${ifn} && cfg=0 return $cfg } @@ -81,13 +83,51 @@ # ifconfig_up() { + local _cfg _ipv6_opts ifconfig_args _cfg=1 + # ifconfig_IF ifconfig_args=`ifconfig_getargs $1` if [ -n "${ifconfig_args}" ]; then ifconfig $1 ${ifconfig_args} + _cfg=0 + fi + + # inet6 specific + if afexists inet6; then + if ipv6if $1; then + if checkyesno ipv6_gateway_enable; then + _ipv6_opts="-accept_rtadv auto_linklocal" + else + _ipv6_opts="auto_linklocal" + fi + else + _ipv6_opts="-auto_linklocal ifdisabled" + fi + + ifconfig $1 inet6 ${_ipv6_opts} + + # ifconfig_IF_ipv6 + ifconfig_args=`ifconfig_getargs $1 ipv6` + if [ -n "${ifconfig_args}" ]; then + ifconfig $1 inet6 -ifdisabled + ifconfig $1 ${ifconfig_args} + _cfg=0 + fi + + # backward compatiblity: $ipv6_ifconfig_IF + ifconfig_args=`get_if_var $1 ipv6_ifconfig_IF` + if [ -n "${ifconfig_args}" ]; then + warn "\$ipv6_ifconfig_$1 is obsolete." \ + " Use ifconfig_$1_ipv6 instead." + ifconfig $1 inet6 -ifdisabled + ifconfig $1 inet6 ${ifconfig_args} + _cfg=0 + fi + fi + + if [ ${_cfg} -eq 0 ]; then ifconfig $1 up - _cfg=0 fi if wpaif $1; then @@ -114,7 +154,7 @@ # ifconfig_down() { - [ -z "$1" ] && return 1 + local _cfg _cfg=1 if wpaif $1; then @@ -136,13 +176,15 @@ } # get_if_var if var [default] -# Return the value of the pseudo-hash corresponding to $if where -# $var is a string containg the sub-string "IF" which will be -# replaced with $if after the characters defined in _punct are -# replaced with '_'. If the variable is unset, replace it with -# $default if given. +# Return the value of the pseudo-hash corresponding to $if where +# $var is a string containg the sub-string "IF" which will be +# replaced with $if after the characters defined in _punct are +# replaced with '_'. If the variable is unset, replace it with +# $default if given. get_if_var() { + local _if _punct _var _default prefix suffix + if [ $# -ne 2 -a $# -ne 3 ]; then err 3 'USAGE: get_if_var name var [default]' fi @@ -160,26 +202,30 @@ eval echo \${${prefix}${_if}${suffix}-${_default}} } -# _ifconfig_getargs if +# _ifconfig_getargs if [af] # Echos the arguments for the supplied interface to stdout. # returns 1 if empty. In general, ifconfig_getargs should be used # outside this file. _ifconfig_getargs() { + local _ifn _af _ifn=$1 + _af=${2+_$2} + if [ -z "$_ifn" ]; then return 1 fi - get_if_var $_ifn ifconfig_IF "$ifconfig_DEFAULT" + get_if_var $_ifn ifconfig_IF$_af "$ifconfig_DEFAULT" } -# ifconfig_getargs if +# ifconfig_getargs if [af] # Takes the result from _ifconfig_getargs and removes pseudo # args such as DHCP and WPA. ifconfig_getargs() { - _tmpargs=`_ifconfig_getargs $1` + local _tmpargs _arg _args + _tmpargs=`_ifconfig_getargs $1 $2` if [ $? -eq 1 ]; then return 1 fi @@ -206,7 +252,9 @@ # boot time and 1 otherwise. autoif() { + local _tmpargs _arg _tmpargs=`_ifconfig_getargs $1` + for _arg in $_tmpargs; do case $_arg in [Nn][Oo][Aa][Uu][Tt][Oo]) @@ -214,6 +262,7 @@ ;; esac done + return 0 } @@ -221,7 +270,9 @@ # Returns 0 if the interface is a DHCP interface and 1 otherwise. dhcpif() { + local _tmpargs _arg _tmpargs=`_ifconfig_getargs $1` + for _arg in $_tmpargs; do case $_arg in [Dd][Hh][Cc][Pp]) @@ -235,6 +286,7 @@ ;; esac done + return 1 } @@ -243,7 +295,9 @@ # 1 otherwise. syncdhcpif() { + local _tmpargs _arg _tmpargs=`_ifconfig_getargs $1` + for _arg in $_tmpargs; do case $_arg in [Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) @@ -254,18 +308,17 @@ ;; esac done - if checkyesno synchronous_dhclient; then - return 0 - else - return 1 - fi + + checkyesno synchronous_dhclient } # wpaif if # Returns 0 if the interface is a WPA interface and 1 otherwise. wpaif() { + local _tmpargs _arg _tmpargs=`_ifconfig_getargs $1` + for _arg in $_tmpargs; do case $_arg in [Ww][Pp][Aa]) @@ -273,17 +326,76 @@ ;; esac done + return 1 } +# afexists af +# Returns 0 if the address family is enabled in the kernel +# 1 otherwise. +afexists() +{ + local _af + _af=$1 + + case ${_af} in + inet) + ${SYSCTL_N} net.inet > /dev/null 2>&1 + ;; + inet6) + ${SYSCTL_N} net.inet6 > /dev/null 2>&1 + ;; + *) + err 1 "afexists(): Unsupported address family: $_af" + ;; + esac +} + +# noafif if +# Returns 0 if the interface has no af configuration and 1 otherwise. +noafif() +{ + local _if + _if=$1 + + case $_if in + pflog[0-9]*|\ + pfsync[0-9]*|\ + an[0-9]*|\ + ath[0-9]*|\ + ipw[0-9]*|\ + iwi[0-9]*|\ + iwn[0-9]*|\ + ral[0-9]*|\ + wi[0-9]*|\ + wl[0-9]*|\ + wpi[0-9]*) + return 0 + ;; + esac + + return 1 +} + # ipv6if if # Returns 0 if the interface should be configured for IPv6 and # 1 otherwise. ipv6if() { - if ! checkyesno ipv6_enable; then + local _if i + _if=$1 + + if ! afexists inet6; then return 1 fi + + # lo0 is always IPv6-enabled + case $_if in + lo0) + return 0 + ;; + esac + case "${ipv6_network_interfaces}" in [Aa][Uu][Tt][Oo]) return 0 @@ -292,40 +404,110 @@ return 1 ;; esac - for v6if in ${ipv6_network_interfaces}; do - if [ "${v6if}" = "${1}" ]; then + + for i in ${ipv6_network_interfaces}; do + if [ "$i" = "$_if" ]; then return 0 fi done + return 1 } +# ipv6_autoconfif if +# Returns 0 if the interface should be configured for IPv6 with +# Stateless Address Configuration, 1 otherwise. +ipv6_autoconfif() +{ + local _if _tmpargs _arg + _if=$1 + + if ! ipv6if $_if; then + return 1 + fi + if noafif $_if; then + return 1 + fi + if checkyesno ipv6_gateway_enable; then + return 1 + fi + + case $_if in + lo0|\ + stf[0-9]*|\ + faith[0-9]*|\ + lp[0-9]*|\ + sl[0-9]*) + return 1 + ;; + esac + + _tmpargs=`_ifconfig_getargs $_if ipv6` + for _arg in $_tmpargs; do + case $_arg in + accept_rtadv) + return 0 + ;; + esac + done + + return 1 +} + # ifexists if # Returns 0 if the interface exists and 1 otherwise. ifexists() { + [ -z "$1" ] && return 1 ifconfig -n $1 > /dev/null 2>&1 } # ipv4_up if -# add IPv4 addresses to the interface $if +# add IPv4 addresses to the interface $if ipv4_up() { + local _if _ret _if=$1 - ifalias_up ${_if} - ipv4_addrs_common ${_if} alias + _ret=1 + + ifalias_up ${_if} inet && _ret=0 + ipv4_addrs_common ${_if} alias && _ret=0 + + return $_ret +} + +# ipv6_up if +# add IPv6 addresses to the interface $if +ipv6_up() +{ + local _if _ret + _if=$1 + _ret=1 + + if ! ipv6if $_if; then + return 0 + fi + + ifalias_up ${_if} inet6 && _ret=0 + ipv6_prefix_hostid_addr_up ${_if} && _ret=0 + ipv6_accept_rtadv_up ${_if} && _ret=0 + + # wait for DAD + sleep `${SYSCTL_N} net.inet6.ip6.dad_count` + sleep 1 + + return $_ret } # ipv4_down if -# remove IPv4 addresses from the interface $if +# remove IPv4 addresses from the interface $if ipv4_down() { + local _if _ifs _ret inetList oldifs _inet _if=$1 _ifs="^" _ret=1 - ifexists ${_if} || return 1 - inetList="`ifconfig ${_if} | grep 'inet ' | tr "\n" "$_ifs"`" oldifs="$IFS" @@ -343,17 +525,55 @@ done IFS="$oldifs" - ifalias_down ${_if} && _ret=0 + ifalias_down ${_if} inet && _ret=0 ipv4_addrs_common ${_if} -alias && _ret=0 return $_ret } +# ipv6_down if +# remove IPv6 addresses from the interface $if +ipv6_down() +{ + local _if _ifs _ret inetList oldifs _inet6 + _if=$1 + _ifs="^" + _ret=1 + + if ! ipv6if $_if; then + return 0 + fi + + ipv6_accept_rtadv_down ${_if} && _ret=0 + ifalias_down ${_if} inet6 && _ret=0 + + inetList="`ifconfig ${_if} | grep 'inet6 ' | tr "\n" "$_ifs"`" + + oldifs="$IFS" + IFS="$_ifs" + for _inet6 in $inetList ; do + # get rid of extraneous line + [ -z "$_inet6" ] && break + + _inet6=`expr "$_inet6" : '.*\(inet6 \([0-9a-f:]*\)\).*'` + + IFS="$oldifs" + ifconfig ${_if} ${_inet6} -alias + IFS="$_ifs" + _ret=0 + done + IFS="$oldifs" + + return $_ret +} + # ipv4_addrs_common if action -# Evaluate the ifconfig_if_ipv4 arguments for interface $if -# and use $action to add or remove IPv4 addresses from $if. +# Evaluate the ifconfig_if_ipv4 arguments for interface $if and +# use $action to add or remove IPv4 addresses from $if. ipv4_addrs_common() -{ +{ + local _ret _if _action _cidr _cidr_addr + local _ipaddr _netmask _range _ipnet _iplow _iphigh _ipcount _ret=1 _if=$1 _action=$2 @@ -386,53 +606,239 @@ fi done done + return $_ret } -# ifalias_up if +# ifalias_up if af # Configure aliases for network interface $if. # It returns 0 if at least one alias was configured or # 1 if there were none. # ifalias_up() { + local _ret + _ret=1 + + case "$2" in + inet) >>> TRUNCATED FOR MAIL (1000 lines) <<<