Date: Wed, 29 Feb 2012 01:04:38 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r232280 - in projects/multi-fibv6/9: . bin/sh cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/lib/libzpool/common/sys contrib/llvm/t... Message-ID: <201202290104.q1T14cfo000243@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Wed Feb 29 01:04:37 2012 New Revision: 232280 URL: http://svn.freebsd.org/changeset/base/232280 Log: IF stable/9 @r232279 Sponsored by: Cisco Systems, Inc. Added: projects/multi-fibv6/9/contrib/llvm/tools/bugpoint/ - copied from r232279, stable/9/contrib/llvm/tools/bugpoint/ projects/multi-fibv6/9/contrib/llvm/tools/llc/ - copied from r232279, stable/9/contrib/llvm/tools/llc/ projects/multi-fibv6/9/contrib/llvm/tools/lli/ - copied from r232279, stable/9/contrib/llvm/tools/lli/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-ar/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-ar/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-as/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-as/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-bcanalyzer/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-bcanalyzer/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-diff/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-diff/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-dis/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-dis/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-extract/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-extract/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-ld/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-ld/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-link/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-link/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-mc/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-mc/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-nm/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-nm/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-objdump/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-objdump/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-prof/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-prof/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-ranlib/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-ranlib/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-rtdyld/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-rtdyld/ projects/multi-fibv6/9/contrib/llvm/tools/llvm-stub/ - copied from r232279, stable/9/contrib/llvm/tools/llvm-stub/ projects/multi-fibv6/9/contrib/llvm/tools/macho-dump/ - copied from r232279, stable/9/contrib/llvm/tools/macho-dump/ projects/multi-fibv6/9/contrib/llvm/tools/opt/ - copied from r232279, stable/9/contrib/llvm/tools/opt/ projects/multi-fibv6/9/lib/clang/libllvmarchive/ - copied from r232279, stable/9/lib/clang/libllvmarchive/ projects/multi-fibv6/9/lib/clang/libllvmdebuginfo/ - copied from r232279, stable/9/lib/clang/libllvmdebuginfo/ projects/multi-fibv6/9/lib/clang/libllvmexecutionengine/ - copied from r232279, stable/9/lib/clang/libllvmexecutionengine/ projects/multi-fibv6/9/lib/clang/libllvminterpreter/ - copied from r232279, stable/9/lib/clang/libllvminterpreter/ projects/multi-fibv6/9/lib/clang/libllvmjit/ - copied from r232279, stable/9/lib/clang/libllvmjit/ projects/multi-fibv6/9/lib/clang/libllvmlinker/ - copied from r232279, stable/9/lib/clang/libllvmlinker/ projects/multi-fibv6/9/lib/clang/libllvmmcdisassembler/ - copied from r232279, stable/9/lib/clang/libllvmmcdisassembler/ projects/multi-fibv6/9/lib/clang/libllvmmcjit/ - copied from r232279, stable/9/lib/clang/libllvmmcjit/ projects/multi-fibv6/9/lib/clang/libllvmobject/ - copied from r232279, stable/9/lib/clang/libllvmobject/ projects/multi-fibv6/9/lib/clang/libllvmruntimedyld/ - copied from r232279, stable/9/lib/clang/libllvmruntimedyld/ projects/multi-fibv6/9/lib/libc/amd64/gen/getcontextx.c - copied unchanged from r232279, stable/9/lib/libc/amd64/gen/getcontextx.c projects/multi-fibv6/9/lib/libc/arm/gen/getcontextx.c - copied unchanged from r232279, stable/9/lib/libc/arm/gen/getcontextx.c projects/multi-fibv6/9/lib/libc/i386/gen/getcontextx.c - copied unchanged from r232279, stable/9/lib/libc/i386/gen/getcontextx.c projects/multi-fibv6/9/lib/libc/ia64/gen/getcontextx.c - copied unchanged from r232279, stable/9/lib/libc/ia64/gen/getcontextx.c projects/multi-fibv6/9/lib/libc/mips/gen/getcontextx.c - copied unchanged from r232279, stable/9/lib/libc/mips/gen/getcontextx.c projects/multi-fibv6/9/lib/libc/powerpc/gen/getcontextx.c - copied unchanged from r232279, stable/9/lib/libc/powerpc/gen/getcontextx.c projects/multi-fibv6/9/lib/libc/powerpc64/gen/getcontextx.c - copied unchanged from r232279, stable/9/lib/libc/powerpc64/gen/getcontextx.c projects/multi-fibv6/9/lib/libc/sparc64/gen/getcontextx.c - copied unchanged from r232279, stable/9/lib/libc/sparc64/gen/getcontextx.c projects/multi-fibv6/9/share/man/man4/isci.4 - copied unchanged from r232279, stable/9/share/man/man4/isci.4 projects/multi-fibv6/9/share/man/man4/netmap.4 - copied unchanged from r232279, stable/9/share/man/man4/netmap.4 projects/multi-fibv6/9/share/man/man4/oce.4 - copied unchanged from r232279, stable/9/share/man/man4/oce.4 projects/multi-fibv6/9/share/man/man4/xnb.4 - copied unchanged from r232279, stable/9/share/man/man4/xnb.4 projects/multi-fibv6/9/sys/amd64/amd64/ptrace_machdep.c - copied unchanged from r232279, stable/9/sys/amd64/amd64/ptrace_machdep.c projects/multi-fibv6/9/sys/cam/ctl/ - copied from r232279, stable/9/sys/cam/ctl/ projects/multi-fibv6/9/sys/conf/WITHOUT_SOURCELESS - copied unchanged from r232279, stable/9/sys/conf/WITHOUT_SOURCELESS projects/multi-fibv6/9/sys/conf/WITHOUT_SOURCELESS_HOST - copied unchanged from r232279, stable/9/sys/conf/WITHOUT_SOURCELESS_HOST projects/multi-fibv6/9/sys/conf/WITHOUT_SOURCELESS_UCODE - copied unchanged from r232279, stable/9/sys/conf/WITHOUT_SOURCELESS_UCODE projects/multi-fibv6/9/sys/dev/isci/ - copied from r232279, stable/9/sys/dev/isci/ projects/multi-fibv6/9/sys/dev/netmap/ - copied from r232279, stable/9/sys/dev/netmap/ projects/multi-fibv6/9/sys/dev/oce/ - copied from r232279, stable/9/sys/dev/oce/ projects/multi-fibv6/9/sys/dev/xen/netback/netback_unit_tests.c - copied unchanged from r232279, stable/9/sys/dev/xen/netback/netback_unit_tests.c - copied unchanged from r232279, stable/9/sys/i386/conf/XENHVM projects/multi-fibv6/9/sys/modules/isci/ - copied from r232279, stable/9/sys/modules/isci/ projects/multi-fibv6/9/sys/modules/oce/ - copied from r232279, stable/9/sys/modules/oce/ projects/multi-fibv6/9/sys/net/netmap.h - copied unchanged from r232279, stable/9/sys/net/netmap.h projects/multi-fibv6/9/sys/net/netmap_user.h - copied unchanged from r232279, stable/9/sys/net/netmap_user.h projects/multi-fibv6/9/tools/build/options/WITHOUT_SOURCELESS - copied unchanged from r232279, stable/9/tools/build/options/WITHOUT_SOURCELESS projects/multi-fibv6/9/tools/build/options/WITHOUT_SOURCELESS_HOST - copied unchanged from r232279, stable/9/tools/build/options/WITHOUT_SOURCELESS_HOST projects/multi-fibv6/9/tools/build/options/WITHOUT_SOURCELESS_UCODE - copied unchanged from r232279, stable/9/tools/build/options/WITHOUT_SOURCELESS_UCODE projects/multi-fibv6/9/tools/build/options/WITH_CLANG_EXTRAS - copied unchanged from r232279, stable/9/tools/build/options/WITH_CLANG_EXTRAS projects/multi-fibv6/9/tools/test/ptrace/ - copied from r232279, stable/9/tools/test/ptrace/ projects/multi-fibv6/9/tools/tools/netmap/ - copied from r232279, stable/9/tools/tools/netmap/ projects/multi-fibv6/9/usr.bin/clang/bugpoint/ - copied from r232279, stable/9/usr.bin/clang/bugpoint/ projects/multi-fibv6/9/usr.bin/clang/llc/ - copied from r232279, stable/9/usr.bin/clang/llc/ projects/multi-fibv6/9/usr.bin/clang/lli/ - copied from r232279, stable/9/usr.bin/clang/lli/ projects/multi-fibv6/9/usr.bin/clang/llvm-ar/ - copied from r232279, stable/9/usr.bin/clang/llvm-ar/ projects/multi-fibv6/9/usr.bin/clang/llvm-as/ - copied from r232279, stable/9/usr.bin/clang/llvm-as/ projects/multi-fibv6/9/usr.bin/clang/llvm-bcanalyzer/ - copied from r232279, stable/9/usr.bin/clang/llvm-bcanalyzer/ projects/multi-fibv6/9/usr.bin/clang/llvm-diff/ - copied from r232279, stable/9/usr.bin/clang/llvm-diff/ projects/multi-fibv6/9/usr.bin/clang/llvm-dis/ - copied from r232279, stable/9/usr.bin/clang/llvm-dis/ projects/multi-fibv6/9/usr.bin/clang/llvm-extract/ - copied from r232279, stable/9/usr.bin/clang/llvm-extract/ projects/multi-fibv6/9/usr.bin/clang/llvm-ld/ - copied from r232279, stable/9/usr.bin/clang/llvm-ld/ projects/multi-fibv6/9/usr.bin/clang/llvm-link/ - copied from r232279, stable/9/usr.bin/clang/llvm-link/ projects/multi-fibv6/9/usr.bin/clang/llvm-mc/ - copied from r232279, stable/9/usr.bin/clang/llvm-mc/ projects/multi-fibv6/9/usr.bin/clang/llvm-nm/ - copied from r232279, stable/9/usr.bin/clang/llvm-nm/ projects/multi-fibv6/9/usr.bin/clang/llvm-objdump/ - copied from r232279, stable/9/usr.bin/clang/llvm-objdump/ projects/multi-fibv6/9/usr.bin/clang/llvm-prof/ - copied from r232279, stable/9/usr.bin/clang/llvm-prof/ projects/multi-fibv6/9/usr.bin/clang/llvm-ranlib/ - copied from r232279, stable/9/usr.bin/clang/llvm-ranlib/ projects/multi-fibv6/9/usr.bin/clang/llvm-rtdyld/ - copied from r232279, stable/9/usr.bin/clang/llvm-rtdyld/ projects/multi-fibv6/9/usr.bin/clang/llvm-stub/ - copied from r232279, stable/9/usr.bin/clang/llvm-stub/ projects/multi-fibv6/9/usr.bin/clang/macho-dump/ - copied from r232279, stable/9/usr.bin/clang/macho-dump/ projects/multi-fibv6/9/usr.bin/clang/opt/ - copied from r232279, stable/9/usr.bin/clang/opt/ - copied from r232279, stable/9/usr.bin/ctlstat/ projects/multi-fibv6/9/usr.sbin/ctladm/ - copied from r232279, stable/9/usr.sbin/ctladm/ Directory Properties: projects/multi-fibv6/9/sys/i386/conf/XENHVM (props changed) projects/multi-fibv6/9/usr.bin/ctlstat/ (props changed) Modified: projects/multi-fibv6/9/MAINTAINERS (contents, props changed) projects/multi-fibv6/9/Makefile (contents, props changed) projects/multi-fibv6/9/bin/sh/exec.c projects/multi-fibv6/9/bin/sh/exec.h projects/multi-fibv6/9/bin/sh/expand.c projects/multi-fibv6/9/bin/sh/expand.h projects/multi-fibv6/9/bin/sh/histedit.c projects/multi-fibv6/9/bin/sh/input.c projects/multi-fibv6/9/bin/sh/input.h projects/multi-fibv6/9/bin/sh/main.c projects/multi-fibv6/9/bin/sh/main.h projects/multi-fibv6/9/bin/sh/myhistedit.h projects/multi-fibv6/9/bin/sh/mystring.c projects/multi-fibv6/9/bin/sh/mystring.h projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h projects/multi-fibv6/9/etc/defaults/periodic.conf projects/multi-fibv6/9/etc/defaults/rc.conf projects/multi-fibv6/9/etc/periodic/daily/404.status-zfs projects/multi-fibv6/9/etc/rc.d/SERVERS projects/multi-fibv6/9/etc/rc.d/accounting projects/multi-fibv6/9/etc/rc.d/addswap projects/multi-fibv6/9/etc/rc.d/amd projects/multi-fibv6/9/etc/rc.d/apm projects/multi-fibv6/9/etc/rc.d/apmd projects/multi-fibv6/9/etc/rc.d/bootparams projects/multi-fibv6/9/etc/rc.d/bsnmpd projects/multi-fibv6/9/etc/rc.d/bthidd projects/multi-fibv6/9/etc/rc.d/cleanvar projects/multi-fibv6/9/etc/rc.d/cleartmp projects/multi-fibv6/9/etc/rc.d/cron projects/multi-fibv6/9/etc/rc.d/ddb projects/multi-fibv6/9/etc/rc.d/devd projects/multi-fibv6/9/etc/rc.d/devfs projects/multi-fibv6/9/etc/rc.d/dhclient projects/multi-fibv6/9/etc/rc.d/dmesg projects/multi-fibv6/9/etc/rc.d/ftp-proxy projects/multi-fibv6/9/etc/rc.d/ftpd projects/multi-fibv6/9/etc/rc.d/gptboot projects/multi-fibv6/9/etc/rc.d/hastd projects/multi-fibv6/9/etc/rc.d/hcsecd projects/multi-fibv6/9/etc/rc.d/hostapd projects/multi-fibv6/9/etc/rc.d/inetd projects/multi-fibv6/9/etc/rc.d/ip6addrctl projects/multi-fibv6/9/etc/rc.d/ipfilter projects/multi-fibv6/9/etc/rc.d/ipfs projects/multi-fibv6/9/etc/rc.d/ipmon projects/multi-fibv6/9/etc/rc.d/ipnat projects/multi-fibv6/9/etc/rc.d/ipsec projects/multi-fibv6/9/etc/rc.d/ipxrouted projects/multi-fibv6/9/etc/rc.d/jail projects/multi-fibv6/9/etc/rc.d/keyserv projects/multi-fibv6/9/etc/rc.d/lockd projects/multi-fibv6/9/etc/rc.d/lpd projects/multi-fibv6/9/etc/rc.d/mountd projects/multi-fibv6/9/etc/rc.d/moused projects/multi-fibv6/9/etc/rc.d/mroute6d projects/multi-fibv6/9/etc/rc.d/mrouted projects/multi-fibv6/9/etc/rc.d/natd projects/multi-fibv6/9/etc/rc.d/netwait projects/multi-fibv6/9/etc/rc.d/newsyslog projects/multi-fibv6/9/etc/rc.d/nfscbd projects/multi-fibv6/9/etc/rc.d/nfsd projects/multi-fibv6/9/etc/rc.d/nfsuserd projects/multi-fibv6/9/etc/rc.d/nscd projects/multi-fibv6/9/etc/rc.d/ntpd projects/multi-fibv6/9/etc/rc.d/ntpdate projects/multi-fibv6/9/etc/rc.d/pf projects/multi-fibv6/9/etc/rc.d/pflog projects/multi-fibv6/9/etc/rc.d/pfsync projects/multi-fibv6/9/etc/rc.d/powerd projects/multi-fibv6/9/etc/rc.d/ppp projects/multi-fibv6/9/etc/rc.d/pppoed projects/multi-fibv6/9/etc/rc.d/quota projects/multi-fibv6/9/etc/rc.d/rarpd projects/multi-fibv6/9/etc/rc.d/rfcomm_pppd_server projects/multi-fibv6/9/etc/rc.d/route6d projects/multi-fibv6/9/etc/rc.d/routed projects/multi-fibv6/9/etc/rc.d/rpcbind projects/multi-fibv6/9/etc/rc.d/rtadvd projects/multi-fibv6/9/etc/rc.d/rtsold projects/multi-fibv6/9/etc/rc.d/rwho projects/multi-fibv6/9/etc/rc.d/sdpd projects/multi-fibv6/9/etc/rc.d/sendmail projects/multi-fibv6/9/etc/rc.d/sshd projects/multi-fibv6/9/etc/rc.d/statd projects/multi-fibv6/9/etc/rc.d/syslogd projects/multi-fibv6/9/etc/rc.d/timed projects/multi-fibv6/9/etc/rc.d/ubthidhci projects/multi-fibv6/9/etc/rc.d/var projects/multi-fibv6/9/etc/rc.d/virecover projects/multi-fibv6/9/etc/rc.d/watchdogd projects/multi-fibv6/9/etc/rc.d/ypbind projects/multi-fibv6/9/etc/rc.d/yppasswdd projects/multi-fibv6/9/etc/rc.d/ypserv projects/multi-fibv6/9/etc/rc.d/ypset projects/multi-fibv6/9/etc/rc.d/ypupdated projects/multi-fibv6/9/etc/rc.d/ypxfrd projects/multi-fibv6/9/etc/rc.resume projects/multi-fibv6/9/etc/rc.subr projects/multi-fibv6/9/etc/rc.suspend projects/multi-fibv6/9/gnu/usr.bin/gdb/kgdb/trgt_amd64.c projects/multi-fibv6/9/include/rpc/Makefile projects/multi-fibv6/9/include/rpcsvc/Makefile projects/multi-fibv6/9/include/stdio.h projects/multi-fibv6/9/lib/clang/Makefile projects/multi-fibv6/9/lib/clang/libllvmanalysis/Makefile projects/multi-fibv6/9/lib/clang/libllvmipa/Makefile projects/multi-fibv6/9/lib/clang/libllvmipo/Makefile projects/multi-fibv6/9/lib/clang/libllvmmc/Makefile projects/multi-fibv6/9/lib/clang/libllvmscalaropts/Makefile projects/multi-fibv6/9/lib/clang/libllvmsupport/Makefile projects/multi-fibv6/9/lib/clang/libllvmtransformutils/Makefile projects/multi-fibv6/9/lib/clang/libllvmx86disassembler/Makefile projects/multi-fibv6/9/lib/libc/amd64/gen/Makefile.inc projects/multi-fibv6/9/lib/libc/arm/gen/Makefile.inc projects/multi-fibv6/9/lib/libc/gen/Symbol.map projects/multi-fibv6/9/lib/libc/gen/directory.3 projects/multi-fibv6/9/lib/libc/gen/getcontext.3 projects/multi-fibv6/9/lib/libc/gen/sysctl.3 projects/multi-fibv6/9/lib/libc/gen/ucontext.3 projects/multi-fibv6/9/lib/libc/i386/gen/Makefile.inc projects/multi-fibv6/9/lib/libc/ia64/gen/Makefile.inc projects/multi-fibv6/9/lib/libc/locale/btowc.3 projects/multi-fibv6/9/lib/libc/mips/gen/Makefile.inc projects/multi-fibv6/9/lib/libc/powerpc/gen/Makefile.inc projects/multi-fibv6/9/lib/libc/powerpc64/gen/Makefile.inc projects/multi-fibv6/9/lib/libc/powerpc64/sys/cerror.S projects/multi-fibv6/9/lib/libc/rpc/Makefile.inc projects/multi-fibv6/9/lib/libc/sparc64/gen/Makefile.inc projects/multi-fibv6/9/lib/libc/sys/jail.2 projects/multi-fibv6/9/lib/libc/sys/ptrace.2 projects/multi-fibv6/9/lib/libc/yp/Makefile.inc projects/multi-fibv6/9/lib/libipsec/pfkey.c projects/multi-fibv6/9/lib/libpmc/pmc.3 projects/multi-fibv6/9/lib/libpmc/pmc.atom.3 projects/multi-fibv6/9/lib/libpmc/pmc.core.3 projects/multi-fibv6/9/lib/libpmc/pmc.core2.3 projects/multi-fibv6/9/lib/libpmc/pmc.corei7.3 projects/multi-fibv6/9/lib/libpmc/pmc.corei7uc.3 projects/multi-fibv6/9/lib/libpmc/pmc.iaf.3 projects/multi-fibv6/9/lib/libpmc/pmc.k7.3 projects/multi-fibv6/9/lib/libpmc/pmc.k8.3 projects/multi-fibv6/9/lib/libpmc/pmc.mips.3 projects/multi-fibv6/9/lib/libpmc/pmc.p4.3 projects/multi-fibv6/9/lib/libpmc/pmc.p5.3 projects/multi-fibv6/9/lib/libpmc/pmc.p6.3 projects/multi-fibv6/9/lib/libpmc/pmc.tsc.3 projects/multi-fibv6/9/lib/libpmc/pmc.ucf.3 projects/multi-fibv6/9/lib/libpmc/pmc.westmere.3 projects/multi-fibv6/9/lib/libpmc/pmc.westmereuc.3 projects/multi-fibv6/9/lib/libpmc/pmc.xscale.3 projects/multi-fibv6/9/lib/libpmc/pmc_allocate.3 projects/multi-fibv6/9/lib/libpmc/pmc_attach.3 projects/multi-fibv6/9/lib/libpmc/pmc_capabilities.3 projects/multi-fibv6/9/lib/libpmc/pmc_configure_logfile.3 projects/multi-fibv6/9/lib/libpmc/pmc_disable.3 projects/multi-fibv6/9/lib/libpmc/pmc_event_names_of_class.3 projects/multi-fibv6/9/lib/libpmc/pmc_get_driver_stats.3 projects/multi-fibv6/9/lib/libpmc/pmc_get_msr.3 projects/multi-fibv6/9/lib/libpmc/pmc_init.3 projects/multi-fibv6/9/lib/libpmc/pmc_name_of_capability.3 projects/multi-fibv6/9/lib/libpmc/pmc_read.3 projects/multi-fibv6/9/lib/libpmc/pmc_set.3 projects/multi-fibv6/9/lib/libpmc/pmc_start.3 projects/multi-fibv6/9/lib/libpmc/pmclog.3 projects/multi-fibv6/9/lib/librpcsvc/Makefile projects/multi-fibv6/9/lib/libthr/thread/thr_sig.c projects/multi-fibv6/9/lib/libthr/thread/thr_umtx.c projects/multi-fibv6/9/lib/libypclnt/Makefile projects/multi-fibv6/9/libexec/rtld-elf/rtld.c projects/multi-fibv6/9/libexec/tftpd/tftp-io.c projects/multi-fibv6/9/libexec/ypxfr/Makefile projects/multi-fibv6/9/release/doc/en_US.ISO8859-1/hardware/article.sgml projects/multi-fibv6/9/release/doc/share/misc/dev.archlist.txt projects/multi-fibv6/9/release/picobsd/tinyware/passwd/Makefile projects/multi-fibv6/9/release/rc.local projects/multi-fibv6/9/sbin/camcontrol/camcontrol.c projects/multi-fibv6/9/sbin/camcontrol/modeedit.c projects/multi-fibv6/9/sbin/fsck_ffs/gjournal.c projects/multi-fibv6/9/sbin/fsirand/fsirand.c projects/multi-fibv6/9/sbin/gvinum/gvinum.c projects/multi-fibv6/9/sbin/hastd/rangelock.c projects/multi-fibv6/9/sbin/ifconfig/ifieee80211.c projects/multi-fibv6/9/sbin/newfs/mkfs.c projects/multi-fibv6/9/sbin/ping6/ping6.c projects/multi-fibv6/9/sbin/tunefs/tunefs.c projects/multi-fibv6/9/share/examples/scsi_target/scsi_cmds.c projects/multi-fibv6/9/share/man/man4/Makefile projects/multi-fibv6/9/share/man/man4/ada.4 projects/multi-fibv6/9/share/man/man4/bge.4 projects/multi-fibv6/9/share/man/man4/cd.4 projects/multi-fibv6/9/share/man/man4/da.4 projects/multi-fibv6/9/share/man/man4/ed.4 projects/multi-fibv6/9/share/man/man4/lagg.4 projects/multi-fibv6/9/share/man/man4/lmc.4 projects/multi-fibv6/9/share/man/man4/sbp.4 projects/multi-fibv6/9/share/man/man4/sfxge.4 projects/multi-fibv6/9/share/man/man4/u3g.4 projects/multi-fibv6/9/share/man/man4/usb_quirk.4 projects/multi-fibv6/9/share/man/man4/wlan.4 projects/multi-fibv6/9/share/man/man5/periodic.conf.5 projects/multi-fibv6/9/share/man/man5/portindex.5 projects/multi-fibv6/9/share/man/man5/rc.conf.5 projects/multi-fibv6/9/share/man/man5/src.conf.5 projects/multi-fibv6/9/share/man/man7/security.7 projects/multi-fibv6/9/share/man/man8/rc.subr.8 projects/multi-fibv6/9/share/man/man9/DEVICE_PROBE.9 projects/multi-fibv6/9/share/mk/bsd.own.mk projects/multi-fibv6/9/sys/amd64/acpica/acpi_switch.S projects/multi-fibv6/9/sys/amd64/acpica/acpi_wakecode.S projects/multi-fibv6/9/sys/amd64/acpica/acpi_wakeup.c projects/multi-fibv6/9/sys/amd64/amd64/apic_vector.S projects/multi-fibv6/9/sys/amd64/amd64/cpu_switch.S projects/multi-fibv6/9/sys/amd64/amd64/fpu.c projects/multi-fibv6/9/sys/amd64/amd64/genassym.c projects/multi-fibv6/9/sys/amd64/amd64/initcpu.c projects/multi-fibv6/9/sys/amd64/amd64/machdep.c projects/multi-fibv6/9/sys/amd64/amd64/minidump_machdep.c projects/multi-fibv6/9/sys/amd64/amd64/mp_machdep.c projects/multi-fibv6/9/sys/amd64/amd64/sys_machdep.c projects/multi-fibv6/9/sys/amd64/amd64/trap.c projects/multi-fibv6/9/sys/amd64/amd64/uma_machdep.c projects/multi-fibv6/9/sys/amd64/amd64/vm_machdep.c projects/multi-fibv6/9/sys/amd64/conf/GENERIC projects/multi-fibv6/9/sys/amd64/conf/NOTES projects/multi-fibv6/9/sys/amd64/ia32/ia32_reg.c projects/multi-fibv6/9/sys/amd64/ia32/ia32_signal.c projects/multi-fibv6/9/sys/amd64/include/cpufunc.h projects/multi-fibv6/9/sys/amd64/include/fpu.h projects/multi-fibv6/9/sys/amd64/include/frame.h projects/multi-fibv6/9/sys/amd64/include/md_var.h projects/multi-fibv6/9/sys/amd64/include/pcb.h projects/multi-fibv6/9/sys/amd64/include/ptrace.h projects/multi-fibv6/9/sys/amd64/include/signal.h projects/multi-fibv6/9/sys/amd64/include/sysarch.h projects/multi-fibv6/9/sys/amd64/include/ucontext.h projects/multi-fibv6/9/sys/cam/scsi/scsi_all.c projects/multi-fibv6/9/sys/cam/scsi/scsi_all.h projects/multi-fibv6/9/sys/cam/scsi/scsi_da.h projects/multi-fibv6/9/sys/cam/scsi/scsi_targ_bh.c projects/multi-fibv6/9/sys/cam/scsi/scsi_xpt.c projects/multi-fibv6/9/sys/cddl/compat/opensolaris/sys/kmem.h projects/multi-fibv6/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h projects/multi-fibv6/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/multi-fibv6/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/multi-fibv6/9/sys/compat/ia32/ia32_signal.h projects/multi-fibv6/9/sys/conf/NOTES projects/multi-fibv6/9/sys/conf/files projects/multi-fibv6/9/sys/conf/files.amd64 projects/multi-fibv6/9/sys/conf/files.i386 projects/multi-fibv6/9/sys/conf/ldscript.powerpc64 projects/multi-fibv6/9/sys/conf/options projects/multi-fibv6/9/sys/conf/options.amd64 projects/multi-fibv6/9/sys/conf/options.i386 projects/multi-fibv6/9/sys/crypto/aesni/aesni.c projects/multi-fibv6/9/sys/crypto/aesni/aesni.h projects/multi-fibv6/9/sys/crypto/aesni/aesni_wrap.c projects/multi-fibv6/9/sys/crypto/via/padlock.c projects/multi-fibv6/9/sys/crypto/via/padlock.h projects/multi-fibv6/9/sys/crypto/via/padlock_cipher.c projects/multi-fibv6/9/sys/crypto/via/padlock_hash.c projects/multi-fibv6/9/sys/dev/acpica/Osd/OsdSynch.c projects/multi-fibv6/9/sys/dev/acpica/acpi.c projects/multi-fibv6/9/sys/dev/acpica/acpi_ec.c projects/multi-fibv6/9/sys/dev/acpica/acpi_hpet.c projects/multi-fibv6/9/sys/dev/acpica/acpi_timer.c projects/multi-fibv6/9/sys/dev/acpica/acpivar.h projects/multi-fibv6/9/sys/dev/ata/ata-queue.c projects/multi-fibv6/9/sys/dev/ata/atapi-cam.c projects/multi-fibv6/9/sys/dev/bge/if_bge.c projects/multi-fibv6/9/sys/dev/bge/if_bgereg.h projects/multi-fibv6/9/sys/dev/ciss/ciss.c projects/multi-fibv6/9/sys/dev/et/if_et.c projects/multi-fibv6/9/sys/dev/fb/vesa.c projects/multi-fibv6/9/sys/dev/fb/vesa.h projects/multi-fibv6/9/sys/dev/isp/isp_freebsd.h projects/multi-fibv6/9/sys/dev/mii/brgphy.c projects/multi-fibv6/9/sys/dev/mii/miidevs projects/multi-fibv6/9/sys/dev/mii/nsphyter.c projects/multi-fibv6/9/sys/dev/mps/mps.c projects/multi-fibv6/9/sys/dev/mps/mps_pci.c projects/multi-fibv6/9/sys/dev/mps/mps_sas.c projects/multi-fibv6/9/sys/dev/mps/mps_sas.h projects/multi-fibv6/9/sys/dev/mps/mps_sas_lsi.c projects/multi-fibv6/9/sys/dev/mps/mps_user.c projects/multi-fibv6/9/sys/dev/mps/mpsvar.h projects/multi-fibv6/9/sys/dev/pci/pci.c projects/multi-fibv6/9/sys/dev/random/nehemiah.c projects/multi-fibv6/9/sys/dev/random/probe.c projects/multi-fibv6/9/sys/dev/re/if_re.c projects/multi-fibv6/9/sys/dev/sound/pcm/sound.c projects/multi-fibv6/9/sys/dev/sound/usb/uaudio.c projects/multi-fibv6/9/sys/dev/usb/serial/u3g.c projects/multi-fibv6/9/sys/dev/usb/serial/usb_serial.c projects/multi-fibv6/9/sys/dev/usb/serial/usb_serial.h projects/multi-fibv6/9/sys/dev/usb/usbdevs projects/multi-fibv6/9/sys/dev/xen/blkback/blkback.c projects/multi-fibv6/9/sys/dev/xen/blkfront/blkfront.c projects/multi-fibv6/9/sys/dev/xen/blkfront/block.h projects/multi-fibv6/9/sys/dev/xen/netback/netback.c projects/multi-fibv6/9/sys/dev/xen/xenpci/evtchn.c projects/multi-fibv6/9/sys/fs/ext2fs/inode.h projects/multi-fibv6/9/sys/fs/nfs/nfs_commonport.c projects/multi-fibv6/9/sys/fs/nfsclient/nfs_clvnops.c projects/multi-fibv6/9/sys/fs/nfsserver/nfs_nfsdcache.c projects/multi-fibv6/9/sys/fs/nfsserver/nfs_nfsdport.c projects/multi-fibv6/9/sys/fs/tmpfs/tmpfs_vnops.c projects/multi-fibv6/9/sys/geom/journal/g_journal.c projects/multi-fibv6/9/sys/i386/conf/GENERIC projects/multi-fibv6/9/sys/i386/conf/NOTES projects/multi-fibv6/9/sys/i386/conf/PAE projects/multi-fibv6/9/sys/i386/i386/machdep.c projects/multi-fibv6/9/sys/i386/include/npx.h projects/multi-fibv6/9/sys/i386/include/ptrace.h projects/multi-fibv6/9/sys/i386/include/signal.h projects/multi-fibv6/9/sys/i386/include/sysarch.h projects/multi-fibv6/9/sys/i386/include/ucontext.h projects/multi-fibv6/9/sys/i386/include/xen/xenpmap.h projects/multi-fibv6/9/sys/i386/include/xen/xenvar.h projects/multi-fibv6/9/sys/i386/isa/npx.c projects/multi-fibv6/9/sys/ia64/conf/GENERIC projects/multi-fibv6/9/sys/kern/kern_fork.c projects/multi-fibv6/9/sys/kern/kern_jail.c projects/multi-fibv6/9/sys/kern/subr_scanf.c projects/multi-fibv6/9/sys/kern/subr_syscall.c projects/multi-fibv6/9/sys/kern/sys_process.c projects/multi-fibv6/9/sys/kern/sysv_shm.c projects/multi-fibv6/9/sys/kern/uipc_mbuf.c projects/multi-fibv6/9/sys/kern/vfs_cache.c projects/multi-fibv6/9/sys/kern/vfs_cluster.c projects/multi-fibv6/9/sys/kern/vfs_mount.c projects/multi-fibv6/9/sys/kern/vfs_subr.c projects/multi-fibv6/9/sys/kern/vfs_syscalls.c projects/multi-fibv6/9/sys/modules/Makefile projects/multi-fibv6/9/sys/modules/drm/Makefile projects/multi-fibv6/9/sys/modules/kgssapi/Makefile projects/multi-fibv6/9/sys/modules/kgssapi_krb5/Makefile projects/multi-fibv6/9/sys/modules/random/Makefile projects/multi-fibv6/9/sys/modules/sound/driver/Makefile projects/multi-fibv6/9/sys/modules/usb/Makefile projects/multi-fibv6/9/sys/net/flowtable.c projects/multi-fibv6/9/sys/net/ieee8023ad_lacp.c projects/multi-fibv6/9/sys/net/if.h projects/multi-fibv6/9/sys/net/if_lagg.c projects/multi-fibv6/9/sys/net/if_lagg.h projects/multi-fibv6/9/sys/net/if_llatbl.c projects/multi-fibv6/9/sys/net/rtsock.c projects/multi-fibv6/9/sys/netgraph/ng_cisco.c projects/multi-fibv6/9/sys/netgraph/ng_cisco.h projects/multi-fibv6/9/sys/netinet/ipfw/ip_fw_nat.c projects/multi-fibv6/9/sys/netinet/sctp_output.c projects/multi-fibv6/9/sys/netinet6/nd6.h projects/multi-fibv6/9/sys/netinet6/nd6_rtr.c projects/multi-fibv6/9/sys/nfsclient/nfs_vnops.c projects/multi-fibv6/9/sys/pc98/conf/GENERIC projects/multi-fibv6/9/sys/pc98/pc98/machdep.c projects/multi-fibv6/9/sys/powerpc/aim/locore64.S projects/multi-fibv6/9/sys/powerpc/aim/swtch64.S projects/multi-fibv6/9/sys/powerpc/aim/trap_subr64.S projects/multi-fibv6/9/sys/powerpc/include/asm.h projects/multi-fibv6/9/sys/powerpc/include/profile.h projects/multi-fibv6/9/sys/powerpc/ofw/ofwcall64.S projects/multi-fibv6/9/sys/powerpc/powerpc/atomic.S projects/multi-fibv6/9/sys/powerpc/powerpc/setjmp.S projects/multi-fibv6/9/sys/sparc64/conf/GENERIC projects/multi-fibv6/9/sys/sys/malloc.h projects/multi-fibv6/9/sys/sys/param.h projects/multi-fibv6/9/sys/sys/proc.h projects/multi-fibv6/9/sys/sys/ptrace.h projects/multi-fibv6/9/sys/sys/socket.h projects/multi-fibv6/9/sys/sys/ucontext.h projects/multi-fibv6/9/sys/sys/vnode.h projects/multi-fibv6/9/sys/ufs/ffs/ffs_softdep.c projects/multi-fibv6/9/sys/ufs/ffs/ffs_vfsops.c projects/multi-fibv6/9/sys/ufs/ffs/ffs_vnops.c projects/multi-fibv6/9/sys/ufs/ufs/inode.h projects/multi-fibv6/9/sys/ufs/ufs/ufs_acl.c projects/multi-fibv6/9/sys/ufs/ufs/ufs_vnops.c projects/multi-fibv6/9/sys/vm/uma.h projects/multi-fibv6/9/sys/vm/uma_core.c projects/multi-fibv6/9/sys/vm/vm_kern.c projects/multi-fibv6/9/sys/vm/vm_map.c projects/multi-fibv6/9/sys/vm/vm_map.h projects/multi-fibv6/9/sys/vm/vm_mmap.c projects/multi-fibv6/9/sys/vm/vm_page.c projects/multi-fibv6/9/sys/vm/vm_page.h projects/multi-fibv6/9/sys/vm/vnode_pager.h projects/multi-fibv6/9/sys/xen/interface/io/blkif.h projects/multi-fibv6/9/sys/xen/interface/io/netif.h projects/multi-fibv6/9/sys/xen/xenbus/xenbusvar.h projects/multi-fibv6/9/tools/build/mk/OptionalObsoleteFiles.inc projects/multi-fibv6/9/tools/regression/bin/sh/builtins/getopts1.0 projects/multi-fibv6/9/tools/regression/bin/test/regress.sh projects/multi-fibv6/9/tools/regression/doat/doat.c projects/multi-fibv6/9/tools/regression/pipe/pipe-fstatbug.c projects/multi-fibv6/9/tools/regression/pipe/pipe-reverse.c projects/multi-fibv6/9/tools/regression/pipe/pipe-wraparound.c projects/multi-fibv6/9/usr.bin/Makefile projects/multi-fibv6/9/usr.bin/brandelf/brandelf.c projects/multi-fibv6/9/usr.bin/bsdiff/bsdiff/bsdiff.c projects/multi-fibv6/9/usr.bin/clang/Makefile projects/multi-fibv6/9/usr.bin/ncplist/ncplist.c projects/multi-fibv6/9/usr.bin/netstat/if.c projects/multi-fibv6/9/usr.bin/sockstat/sockstat.1 projects/multi-fibv6/9/usr.bin/sockstat/sockstat.c projects/multi-fibv6/9/usr.bin/split/split.c projects/multi-fibv6/9/usr.sbin/Makefile projects/multi-fibv6/9/usr.sbin/amd/Makefile.inc projects/multi-fibv6/9/usr.sbin/bootparamd/bootparamd/Makefile projects/multi-fibv6/9/usr.sbin/bootparamd/callbootd/Makefile projects/multi-fibv6/9/usr.sbin/gssd/Makefile projects/multi-fibv6/9/usr.sbin/keyserv/Makefile projects/multi-fibv6/9/usr.sbin/makefs/cd9660.c projects/multi-fibv6/9/usr.sbin/makefs/cd9660.h projects/multi-fibv6/9/usr.sbin/makefs/cd9660/cd9660_write.c projects/multi-fibv6/9/usr.sbin/makefs/ffs.c projects/multi-fibv6/9/usr.sbin/makefs/makefs.8 projects/multi-fibv6/9/usr.sbin/makefs/makefs.c projects/multi-fibv6/9/usr.sbin/makefs/makefs.h projects/multi-fibv6/9/usr.sbin/makefs/walk.c projects/multi-fibv6/9/usr.sbin/mlxcontrol/interface.c projects/multi-fibv6/9/usr.sbin/rpc.lockd/Makefile projects/multi-fibv6/9/usr.sbin/rpc.statd/Makefile projects/multi-fibv6/9/usr.sbin/rpc.yppasswdd/Makefile projects/multi-fibv6/9/usr.sbin/rpc.ypupdated/Makefile projects/multi-fibv6/9/usr.sbin/rpc.ypxfrd/Makefile projects/multi-fibv6/9/usr.sbin/usbdump/usbdump.8 projects/multi-fibv6/9/usr.sbin/usbdump/usbdump.c projects/multi-fibv6/9/usr.sbin/yppush/Makefile projects/multi-fibv6/9/usr.sbin/ypserv/Makefile Directory Properties: projects/multi-fibv6/9/ (props changed) projects/multi-fibv6/9/bin/sh/ (props changed) projects/multi-fibv6/9/cddl/ (props changed) projects/multi-fibv6/9/cddl/contrib/opensolaris/ (props changed) projects/multi-fibv6/9/contrib/llvm/ (props changed) projects/multi-fibv6/9/etc/ (props changed) projects/multi-fibv6/9/gnu/usr.bin/gdb/ (props changed) projects/multi-fibv6/9/gnu/usr.bin/gdb/kgdb/ (props changed) projects/multi-fibv6/9/include/ (props changed) projects/multi-fibv6/9/lib/ (props changed) projects/multi-fibv6/9/lib/clang/ (props changed) projects/multi-fibv6/9/lib/libc/ (props changed) projects/multi-fibv6/9/lib/libc/sys/ (props changed) projects/multi-fibv6/9/lib/libipsec/ (props changed) projects/multi-fibv6/9/lib/libpmc/ (props changed) projects/multi-fibv6/9/lib/librpcsvc/ (props changed) projects/multi-fibv6/9/lib/libthr/ (props changed) projects/multi-fibv6/9/lib/libypclnt/ (props changed) projects/multi-fibv6/9/libexec/rtld-elf/ (props changed) projects/multi-fibv6/9/libexec/tftpd/ (props changed) projects/multi-fibv6/9/libexec/ypxfr/ (props changed) projects/multi-fibv6/9/release/ (props changed) projects/multi-fibv6/9/release/doc/en_US.ISO8859-1/hardware/ (props changed) projects/multi-fibv6/9/release/picobsd/tinyware/passwd/ (props changed) projects/multi-fibv6/9/sbin/ (props changed) projects/multi-fibv6/9/sbin/camcontrol/ (props changed) projects/multi-fibv6/9/sbin/fsck_ffs/ (props changed) projects/multi-fibv6/9/sbin/fsirand/ (props changed) projects/multi-fibv6/9/sbin/geom/ (props changed) projects/multi-fibv6/9/sbin/gvinum/ (props changed) projects/multi-fibv6/9/sbin/hastd/ (props changed) projects/multi-fibv6/9/sbin/ifconfig/ (props changed) projects/multi-fibv6/9/sbin/newfs/ (props changed) projects/multi-fibv6/9/sbin/ping6/ (props changed) projects/multi-fibv6/9/sbin/tunefs/ (props changed) projects/multi-fibv6/9/share/ (props changed) projects/multi-fibv6/9/share/examples/ (props changed) projects/multi-fibv6/9/share/examples/diskless/ (props changed) projects/multi-fibv6/9/share/examples/ppp/ (props changed) projects/multi-fibv6/9/share/examples/printing/ (props changed) projects/multi-fibv6/9/share/man/ (props changed) projects/multi-fibv6/9/share/man/man4/ (props changed) projects/multi-fibv6/9/share/man/man5/ (props changed) projects/multi-fibv6/9/share/man/man7/ (props changed) projects/multi-fibv6/9/share/man/man9/ (props changed) projects/multi-fibv6/9/share/mk/ (props changed) projects/multi-fibv6/9/share/mk/bsd.arch.inc.mk (props changed) projects/multi-fibv6/9/sys/ (props changed) projects/multi-fibv6/9/sys/amd64/include/xen/ (props changed) projects/multi-fibv6/9/sys/boot/ (props changed) projects/multi-fibv6/9/sys/boot/i386/efi/ (props changed) projects/multi-fibv6/9/sys/boot/ia64/efi/ (props changed) projects/multi-fibv6/9/sys/boot/ia64/ski/ (props changed) projects/multi-fibv6/9/sys/boot/powerpc/boot1.chrp/ (props changed) projects/multi-fibv6/9/sys/boot/powerpc/ofw/ (props changed) projects/multi-fibv6/9/sys/cddl/contrib/opensolaris/ (props changed) projects/multi-fibv6/9/sys/conf/ (props changed) projects/multi-fibv6/9/sys/contrib/dev/acpica/ (props changed) projects/multi-fibv6/9/sys/contrib/octeon-sdk/ (props changed) projects/multi-fibv6/9/sys/contrib/pf/ (props changed) projects/multi-fibv6/9/sys/contrib/x86emu/ (props changed) projects/multi-fibv6/9/tools/ (props changed) projects/multi-fibv6/9/tools/build/options/ (props changed) projects/multi-fibv6/9/tools/regression/bin/sh/ (props changed) projects/multi-fibv6/9/tools/regression/bin/test/ (props changed) projects/multi-fibv6/9/tools/regression/doat/ (props changed) projects/multi-fibv6/9/tools/regression/pipe/ (props changed) projects/multi-fibv6/9/tools/test/ (props changed) projects/multi-fibv6/9/tools/tools/ (props changed) projects/multi-fibv6/9/usr.bin/ (props changed) projects/multi-fibv6/9/usr.bin/brandelf/ (props changed) projects/multi-fibv6/9/usr.bin/bsdiff/ (props changed) projects/multi-fibv6/9/usr.bin/clang/ (props changed) projects/multi-fibv6/9/usr.bin/ncplist/ (props changed) projects/multi-fibv6/9/usr.bin/netstat/ (props changed) projects/multi-fibv6/9/usr.bin/sockstat/ (props changed) projects/multi-fibv6/9/usr.bin/split/ (props changed) projects/multi-fibv6/9/usr.sbin/amd/ (props changed) projects/multi-fibv6/9/usr.sbin/bootparamd/ (props changed) projects/multi-fibv6/9/usr.sbin/gssd/ (props changed) projects/multi-fibv6/9/usr.sbin/keyserv/ (props changed) projects/multi-fibv6/9/usr.sbin/makefs/ (props changed) projects/multi-fibv6/9/usr.sbin/rpc.lockd/ (props changed) projects/multi-fibv6/9/usr.sbin/rpc.statd/ (props changed) projects/multi-fibv6/9/usr.sbin/rpc.yppasswdd/ (props changed) projects/multi-fibv6/9/usr.sbin/rpc.ypupdated/ (props changed) projects/multi-fibv6/9/usr.sbin/rpc.ypxfrd/ (props changed) projects/multi-fibv6/9/usr.sbin/usbdump/ (props changed) projects/multi-fibv6/9/usr.sbin/yppush/ (props changed) projects/multi-fibv6/9/usr.sbin/ypserv/ (props changed) Modified: projects/multi-fibv6/9/MAINTAINERS ============================================================================== --- projects/multi-fibv6/9/MAINTAINERS Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/MAINTAINERS Wed Feb 29 01:04:37 2012 (r232280) @@ -126,6 +126,7 @@ lib/libc/stdtime edwin Heads-up apprec sysinstall randi Please contact about any major changes so that they can be co-ordinated. sbin/routed bms Pre-commit review; notify vendor at rhyolite.com +isci(4) jimharris Pre-commit review requested. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. Modified: projects/multi-fibv6/9/Makefile ============================================================================== --- projects/multi-fibv6/9/Makefile Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/Makefile Wed Feb 29 01:04:37 2012 (r232280) @@ -24,7 +24,7 @@ # check-old-dirs - List obsolete directories. # check-old-files - List obsolete files. # check-old-libs - List obsolete libraries. -# delete-old - Delete obsolete directories/files/libraries. +# delete-old - Delete obsolete directories/files. # delete-old-dirs - Delete obsolete directories. # delete-old-files - Delete obsolete files. # delete-old-libs - Delete obsolete libraries. Modified: projects/multi-fibv6/9/bin/sh/exec.c ============================================================================== --- projects/multi-fibv6/9/bin/sh/exec.c Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/bin/sh/exec.c Wed Feb 29 01:04:37 2012 (r232280) @@ -100,6 +100,7 @@ static void tryexec(char *, char **, cha static void printentry(struct tblentry *, int); static struct tblentry *cmdlookup(const char *, int); static void delete_cmd_entry(void); +static void addcmdentry(const char *, struct cmdentry *); @@ -593,7 +594,7 @@ delete_cmd_entry(void) * the same name. */ -void +static void addcmdentry(const char *name, struct cmdentry *entry) { struct tblentry *cmdp; Modified: projects/multi-fibv6/9/bin/sh/exec.h ============================================================================== --- projects/multi-fibv6/9/bin/sh/exec.h Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/bin/sh/exec.h Wed Feb 29 01:04:37 2012 (r232280) @@ -70,7 +70,6 @@ void find_command(const char *, struct c int find_builtin(const char *, int *); void hashcd(void); void changepath(const char *); -void addcmdentry(const char *, struct cmdentry *); void defun(const char *, union node *); int unsetfunc(const char *); int typecmd_impl(int, char **, int, const char *); Modified: projects/multi-fibv6/9/bin/sh/expand.c ============================================================================== --- projects/multi-fibv6/9/bin/sh/expand.c Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/bin/sh/expand.c Wed Feb 29 01:04:37 2012 (r232280) @@ -113,6 +113,7 @@ static void expmeta(char *, char *); static void addfname(char *); static struct strlist *expsort(struct strlist *); static struct strlist *msort(struct strlist *, int); +static int patmatch(const char *, const char *, int); static char *cvtnum(int, char *); static int collate_range_cmp(wchar_t, wchar_t); @@ -1435,7 +1436,7 @@ match_charclass(const char *p, wchar_t c * Returns true if the pattern matches the string. */ -int +static int patmatch(const char *pattern, const char *string, int squoted) { const char *p, *q, *end; Modified: projects/multi-fibv6/9/bin/sh/expand.h ============================================================================== --- projects/multi-fibv6/9/bin/sh/expand.h Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/bin/sh/expand.h Wed Feb 29 01:04:37 2012 (r232280) @@ -60,6 +60,5 @@ union node; void expandhere(union node *, int); void expandarg(union node *, struct arglist *, int); void expari(int); -int patmatch(const char *, const char *, int); void rmescapes(char *); int casematch(union node *, const char *); Modified: projects/multi-fibv6/9/bin/sh/histedit.c ============================================================================== --- projects/multi-fibv6/9/bin/sh/histedit.c Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/bin/sh/histedit.c Wed Feb 29 01:04:37 2012 (r232280) @@ -70,6 +70,8 @@ int displayhist; static FILE *el_in, *el_out, *el_err; static char *fc_replace(const char *, char *, char *); +static int not_fcnumber(const char *); +static int str_to_event(const char *, int); /* * Set history and editing status. Called whenever the status may @@ -425,7 +427,7 @@ fc_replace(const char *s, char *p, char return (dest); } -int +static int not_fcnumber(const char *s) { if (s == NULL) @@ -435,7 +437,7 @@ not_fcnumber(const char *s) return (!is_number(s)); } -int +static int str_to_event(const char *str, int last) { HistEvent he; Modified: projects/multi-fibv6/9/bin/sh/input.c ============================================================================== --- projects/multi-fibv6/9/bin/sh/input.c Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/bin/sh/input.c Wed Feb 29 01:04:37 2012 (r232280) @@ -106,6 +106,7 @@ EditLine *el; /* cookie for editline p static void pushfile(void); static int preadfd(void); +static void popstring(void); #ifdef mkinit INCLUDE "input.h" @@ -372,7 +373,7 @@ pushstring(char *s, int len, void *ap) INTON; } -void +static void popstring(void) { struct strpush *sp = parsefile->strpush; Modified: projects/multi-fibv6/9/bin/sh/input.h ============================================================================== --- projects/multi-fibv6/9/bin/sh/input.h Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/bin/sh/input.h Wed Feb 29 01:04:37 2012 (r232280) @@ -53,7 +53,6 @@ int preadbuffer(void); int preadateof(void); void pungetc(void); void pushstring(char *, int, void *); -void popstring(void); void setinputfile(const char *, int); void setinputfd(int, int); void setinputstring(char *, int); Modified: projects/multi-fibv6/9/bin/sh/main.c ============================================================================== --- projects/multi-fibv6/9/bin/sh/main.c Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/bin/sh/main.c Wed Feb 29 01:04:37 2012 (r232280) @@ -79,6 +79,7 @@ int rootshell; struct jmploc main_handler; int localeisutf8, initial_localeisutf8; +static void cmdloop(int); static void read_profile(char *); static char *find_dot_file(char *); @@ -184,7 +185,7 @@ state4: /* XXX ??? - why isn't this befo * loop; it turns on prompting if the shell is interactive. */ -void +static void cmdloop(int top) { union node *n; Modified: projects/multi-fibv6/9/bin/sh/main.h ============================================================================== --- projects/multi-fibv6/9/bin/sh/main.h Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/bin/sh/main.h Wed Feb 29 01:04:37 2012 (r232280) @@ -38,4 +38,3 @@ extern int rootshell; /* true if we aren extern struct jmploc main_handler; /* top level exception handler */ void readcmdfile(const char *); -void cmdloop(int); Modified: projects/multi-fibv6/9/bin/sh/myhistedit.h ============================================================================== --- projects/multi-fibv6/9/bin/sh/myhistedit.h Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/bin/sh/myhistedit.h Wed Feb 29 01:04:37 2012 (r232280) @@ -39,6 +39,4 @@ extern int displayhist; void histedit(void); void sethistsize(const char *); void setterm(const char *); -int not_fcnumber(const char *); -int str_to_event(const char *, int); Modified: projects/multi-fibv6/9/bin/sh/mystring.c ============================================================================== --- projects/multi-fibv6/9/bin/sh/mystring.c Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/bin/sh/mystring.c Wed Feb 29 01:04:37 2012 (r232280) @@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$"); * * equal(s1, s2) Return true if strings are equal. * scopy(from, to) Copy a string. - * scopyn(from, to, n) Like scopy, but checks for overflow. * number(s) Convert a string of digits to an integer. * is_number(s) Return true if s is a string of digits. */ @@ -67,24 +66,6 @@ char nullstr[1]; /* zero length string /* - * scopyn - copy a string from "from" to "to", truncating the string - * if necessary. "To" is always nul terminated, even if - * truncation is performed. "Size" is the size of "to". - */ - -void -scopyn(const char *from, char *to, int size) -{ - - while (--size > 0) { - if ((*to++ = *from++) == '\0') - return; - } - *to = '\0'; -} - - -/* * prefix -- see if pfx is a prefix of string. */ Modified: projects/multi-fibv6/9/bin/sh/mystring.h ============================================================================== --- projects/multi-fibv6/9/bin/sh/mystring.h Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/bin/sh/mystring.h Wed Feb 29 01:04:37 2012 (r232280) @@ -35,7 +35,6 @@ #include <string.h> -void scopyn(const char *, char *, int); int prefix(const char *, const char *); int number(const char *); int is_number(const char *); Modified: projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c ============================================================================== --- projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Wed Feb 29 01:04:37 2012 (r232280) @@ -20,6 +20,8 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>. + * All rights reserved. */ #include <libintl.h> @@ -129,8 +131,11 @@ zfs_callback(zfs_handle_t *zhp, void *da cb->cb_depth++; if (zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM) (void) zfs_iter_filesystems(zhp, zfs_callback, data); - if ((zfs_get_type(zhp) != ZFS_TYPE_SNAPSHOT) && include_snaps) - (void) zfs_iter_snapshots(zhp, zfs_callback, data); + if ((zfs_get_type(zhp) != ZFS_TYPE_SNAPSHOT) && include_snaps) { + (void) zfs_iter_snapshots(zhp, + (cb->cb_flags & ZFS_ITER_SIMPLE) != 0, zfs_callback, + data); + } cb->cb_depth--; } @@ -184,6 +189,14 @@ zfs_free_sort_columns(zfs_sort_column_t } } +boolean_t +zfs_sort_only_by_name(const zfs_sort_column_t *sc) +{ + + return (sc != NULL && sc->sc_next == NULL && + sc->sc_prop == ZFS_PROP_NAME); +} + /* ARGSUSED */ static int zfs_compare(const void *larg, const void *rarg, void *unused) @@ -224,7 +237,13 @@ zfs_compare(const void *larg, const void lcreate = zfs_prop_get_int(l, ZFS_PROP_CREATETXG); rcreate = zfs_prop_get_int(r, ZFS_PROP_CREATETXG); - if (lcreate < rcreate) + /* + * Both lcreate and rcreate being 0 means we don't have + * properties and we should compare full name. + */ + if (lcreate == 0 && rcreate == 0) + ret = strcmp(lat + 1, rat + 1); + else if (lcreate < rcreate) ret = -1; else if (lcreate > rcreate) ret = 1; @@ -290,7 +309,14 @@ zfs_sort(const void *larg, const void *r if (rvalid) verify(nvlist_lookup_string(rval, ZPROP_VALUE, &rstr) == 0); + } else if (psc->sc_prop == ZFS_PROP_NAME) { + lvalid = rvalid = B_TRUE; + + (void) strlcpy(lbuf, zfs_get_name(l), sizeof(lbuf)); + (void) strlcpy(rbuf, zfs_get_name(r), sizeof(rbuf)); + lstr = lbuf; + rstr = rbuf; } else if (zfs_prop_is_string(psc->sc_prop)) { lvalid = (zfs_prop_get(l, psc->sc_prop, lbuf, sizeof (lbuf), NULL, NULL, 0, B_TRUE) == 0); Modified: projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h ============================================================================== --- projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h Wed Feb 29 01:04:37 2012 (r232280) @@ -43,11 +43,13 @@ typedef struct zfs_sort_column { #define ZFS_ITER_PROP_LISTSNAPS (1 << 2) #define ZFS_ITER_DEPTH_LIMIT (1 << 3) #define ZFS_ITER_RECVD_PROPS (1 << 4) +#define ZFS_ITER_SIMPLE (1 << 5) int zfs_for_each(int, char **, int options, zfs_type_t, zfs_sort_column_t *, zprop_list_t **, int, zfs_iter_f, void *); int zfs_add_sort_column(zfs_sort_column_t **, const char *, boolean_t); void zfs_free_sort_columns(zfs_sort_column_t *); +boolean_t zfs_sort_only_by_name(const zfs_sort_column_t *); #ifdef __cplusplus } Modified: projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Wed Feb 29 01:04:37 2012 (r232280) @@ -23,7 +23,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2012 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011 by Delphix. All rights reserved. - * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>. + * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>. * All rights reserved. * Copyright (c) 2011 Martin Matuska <mm@FreeBSD.org>. All rights reserved. */ @@ -2838,7 +2838,12 @@ print_dataset(zfs_handle_t *zhp, zprop_l first = B_FALSE; } - if (pl->pl_prop != ZPROP_INVAL) { + if (pl->pl_prop == ZFS_PROP_NAME) { + (void) strlcpy(property, zfs_get_name(zhp), + sizeof(property)); + propstr = property; + right_justify = zfs_prop_align_right(pl->pl_prop); + } else if (pl->pl_prop != ZPROP_INVAL) { if (zfs_prop_get(zhp, pl->pl_prop, property, sizeof (property), NULL, NULL, 0, B_FALSE) != 0) propstr = "-"; @@ -3005,6 +3010,13 @@ zfs_do_list(int argc, char **argv) fields = default_fields; /* + * If we are only going to list snapshot names and sort by name, + * then we can use faster version. + */ + if (strcmp(fields, "name") == 0 && zfs_sort_only_by_name(sortcol)) + flags |= ZFS_ITER_SIMPLE; + + /* * If "-o space" and no types were specified, don't display snapshots. */ if (strcmp(fields, "space") == 0 && types_specified == B_FALSE) Modified: projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Wed Feb 29 01:04:37 2012 (r232280) @@ -507,7 +507,7 @@ extern int zfs_iter_root(libzfs_handle_t extern int zfs_iter_children(zfs_handle_t *, zfs_iter_f, void *); extern int zfs_iter_dependents(zfs_handle_t *, boolean_t, zfs_iter_f, void *); extern int zfs_iter_filesystems(zfs_handle_t *, zfs_iter_f, void *); -extern int zfs_iter_snapshots(zfs_handle_t *, zfs_iter_f, void *); +extern int zfs_iter_snapshots(zfs_handle_t *, boolean_t, zfs_iter_f, void *); extern int zfs_iter_snapshots_sorted(zfs_handle_t *, zfs_iter_f, void *); extern int zfs_iter_snapspec(zfs_handle_t *, const char *, zfs_iter_f, void *); Modified: projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Wed Feb 29 01:04:37 2012 (r232280) @@ -23,7 +23,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2010 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011 by Delphix. All rights reserved. - * Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>. + * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>. * All rights reserved. */ @@ -514,6 +514,22 @@ make_dataset_handle_zc(libzfs_handle_t * } zfs_handle_t * +make_dataset_simple_handle_zc(zfs_handle_t *pzhp, zfs_cmd_t *zc) +{ + zfs_handle_t *zhp = calloc(sizeof (zfs_handle_t), 1); + + if (zhp == NULL) + return (NULL); + + zhp->zfs_hdl = pzhp->zfs_hdl; + (void) strlcpy(zhp->zfs_name, zc->zc_name, sizeof (zhp->zfs_name)); + zhp->zfs_head_type = pzhp->zfs_type; + zhp->zfs_type = ZFS_TYPE_SNAPSHOT; + zhp->zpool_hdl = zpool_handle(zhp); + return (zhp); +} + +zfs_handle_t * zfs_handle_dup(zfs_handle_t *zhp_orig) { zfs_handle_t *zhp = calloc(sizeof (zfs_handle_t), 1); Modified: projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h ============================================================================== --- projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h Wed Feb 29 01:04:37 2012 (r232280) @@ -150,7 +150,7 @@ int zpool_standard_error_fmt(libzfs_hand int get_dependents(libzfs_handle_t *, boolean_t, const char *, char ***, size_t *); zfs_handle_t *make_dataset_handle_zc(libzfs_handle_t *, zfs_cmd_t *); - +zfs_handle_t *make_dataset_simple_handle_zc(zfs_handle_t *, zfs_cmd_t *); int zprop_parse_value(libzfs_handle_t *, nvpair_t *, int, zfs_type_t, nvlist_t *, char **, uint64_t *, const char *); Modified: projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c ============================================================================== --- projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c Wed Feb 29 01:04:37 2012 (r232280) @@ -23,6 +23,8 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2010 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>. + * All rights reserved. */ #include <stdio.h> @@ -137,7 +139,8 @@ zfs_iter_filesystems(zfs_handle_t *zhp, * Iterate over all snapshots */ int -zfs_iter_snapshots(zfs_handle_t *zhp, zfs_iter_f func, void *data) +zfs_iter_snapshots(zfs_handle_t *zhp, boolean_t simple, zfs_iter_f func, + void *data) { zfs_cmd_t zc = { 0 }; zfs_handle_t *nzhp; @@ -146,15 +149,19 @@ zfs_iter_snapshots(zfs_handle_t *zhp, zf if (zhp->zfs_type == ZFS_TYPE_SNAPSHOT) return (0); + zc.zc_simple = simple; + if (zcmd_alloc_dst_nvlist(zhp->zfs_hdl, &zc, 0) != 0) return (-1); while ((ret = zfs_do_list_ioctl(zhp, ZFS_IOC_SNAPSHOT_LIST_NEXT, &zc)) == 0) { - if ((nzhp = make_dataset_handle_zc(zhp->zfs_hdl, - &zc)) == NULL) { + if (simple) + nzhp = make_dataset_simple_handle_zc(zhp, &zc); + else + nzhp = make_dataset_handle_zc(zhp->zfs_hdl, &zc); + if (nzhp == NULL) continue; - } if ((ret = func(nzhp, data)) != 0) { zcmd_free_nvlists(&zc); @@ -234,7 +241,7 @@ zfs_iter_snapshots_sorted(zfs_handle_t * avl_create(&avl, zfs_snapshot_compare, sizeof (zfs_node_t), offsetof(zfs_node_t, zn_avlnode)); - ret = zfs_iter_snapshots(zhp, zfs_sort_snaps, &avl); + ret = zfs_iter_snapshots(zhp, B_FALSE, zfs_sort_snaps, &avl); for (node = avl_first(&avl); node != NULL; node = AVL_NEXT(&avl, node)) ret |= callback(node->zn_handle, data); @@ -378,7 +385,7 @@ zfs_iter_children(zfs_handle_t *zhp, zfs if ((ret = zfs_iter_filesystems(zhp, func, data)) != 0) return (ret); - return (zfs_iter_snapshots(zhp, func, data)); + return (zfs_iter_snapshots(zhp, B_FALSE, func, data)); } @@ -439,8 +446,10 @@ iter_dependents_cb(zfs_handle_t *zhp, vo isf.next = ida->stack; ida->stack = &isf; err = zfs_iter_filesystems(zhp, iter_dependents_cb, ida); - if (err == 0) - err = zfs_iter_snapshots(zhp, iter_dependents_cb, ida); + if (err == 0) { + err = zfs_iter_snapshots(zhp, B_FALSE, + iter_dependents_cb, ida); + } ida->stack = isf.next; } if (!first && err == 0) Modified: projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c ============================================================================== --- projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c Wed Feb 29 01:04:37 2012 (r232280) @@ -22,6 +22,8 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>. + * All rights reserved. */ #include <assert.h> @@ -717,7 +719,7 @@ send_iterate_fs(zfs_handle_t *zhp, void sd->parent_fromsnap_guid = 0; VERIFY(0 == nvlist_alloc(&sd->parent_snaps, NV_UNIQUE_NAME, 0)); VERIFY(0 == nvlist_alloc(&sd->snapprops, NV_UNIQUE_NAME, 0)); - (void) zfs_iter_snapshots(zhp, send_iterate_snap, sd); + (void) zfs_iter_snapshots(zhp, B_FALSE, send_iterate_snap, sd); VERIFY(0 == nvlist_add_nvlist(nvfs, "snaps", sd->parent_snaps)); VERIFY(0 == nvlist_add_nvlist(nvfs, "snapprops", sd->snapprops)); nvlist_free(sd->parent_snaps); Modified: projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h ============================================================================== --- projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h Wed Feb 29 01:04:37 2012 (r232280) @@ -329,6 +329,7 @@ extern void cv_broadcast(kcondvar_t *cv) #define KM_SLEEP UMEM_NOFAIL #define KM_PUSHPAGE KM_SLEEP #define KM_NOSLEEP UMEM_DEFAULT +#define KM_NODEBUG 0 #define KMC_NODEBUG UMC_NODEBUG #define KMC_NOTOUCH 0 /* not needed for userland caches */ #define kmem_alloc(_s, _f) umem_alloc(_s, _f) Modified: projects/multi-fibv6/9/etc/defaults/periodic.conf ============================================================================== --- projects/multi-fibv6/9/etc/defaults/periodic.conf Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/defaults/periodic.conf Wed Feb 29 01:04:37 2012 (r232280) @@ -96,6 +96,7 @@ daily_status_disks_df_flags="-l -h" # d # 404.status-zfs daily_status_zfs_enable="NO" # Check ZFS +daily_status_zfs_zpool_list_enable="YES" # List ZFS pools # 405.status-ata_raid daily_status_ata_raid_enable="NO" # Check ATA raid status Modified: projects/multi-fibv6/9/etc/defaults/rc.conf ============================================================================== --- projects/multi-fibv6/9/etc/defaults/rc.conf Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/defaults/rc.conf Wed Feb 29 01:04:37 2012 (r232280) @@ -24,11 +24,13 @@ rc_debug="NO" # Set to YES to enable debugging output from rc.d rc_info="NO" # Enables display of informational messages at boot. rc_startmsgs="YES" # Show "Starting foo:" messages at boot -rcshutdown_timeout="30" # Seconds to wait before terminating rc.shutdown +rcshutdown_timeout="90" # Seconds to wait before terminating rc.shutdown early_late_divider="FILESYSTEMS" # Script that separates early/late # stages of the boot process. Make sure you know # the ramifications if you change this. # See rc.conf(5) for more details. +always_force_depends="NO" # Set to check that indicated dependencies are + # running during boot (can increase boot time). swapfile="NO" # Set to name of swapfile if aux swapfile desired. apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). @@ -648,6 +650,7 @@ devfs_rulesets="/etc/defaults/devfs.rule 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)) +devfs_load_rulesets="NO" # Enable to always load the default rulesets performance_cx_lowest="HIGH" # Online CPU idle state performance_cpu_freq="NONE" # Online CPU frequency economy_cx_lowest="HIGH" # Offline CPU idle state Modified: projects/multi-fibv6/9/etc/periodic/daily/404.status-zfs ============================================================================== --- projects/multi-fibv6/9/etc/periodic/daily/404.status-zfs Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/periodic/daily/404.status-zfs Wed Feb 29 01:04:37 2012 (r232280) @@ -16,12 +16,21 @@ case "$daily_status_zfs_enable" in echo echo 'Checking status of zfs pools:' - out=`zpool status -x` - echo "$out" + case "$daily_status_zfs_zpool_list_enable" in + [Yy][Ee][Ss]) + lout=`zpool list` + echo "$lout" + echo + ;; + *) + ;; + esac + sout=`zpool status -x` + echo "$sout" # zpool status -x always exits with 0, so we have to interpret its # output to see what's going on. - if [ "$out" = "all pools are healthy" \ - -o "$out" = "no pools available" ]; then + if [ "$sout" = "all pools are healthy" \ + -o "$sout" = "no pools available" ]; then rc=0 else rc=1 Modified: projects/multi-fibv6/9/etc/rc.d/SERVERS ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/SERVERS Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/SERVERS Wed Feb 29 01:04:37 2012 (r232280) @@ -4,7 +4,7 @@ # # PROVIDE: SERVERS -# REQUIRE: mountcritremote abi ldconfig savecore +# REQUIRE: mountcritremote abi ldconfig savecore watchdogd # This is a dummy dependency, for early-start servers relying on # some basic configuration. Modified: projects/multi-fibv6/9/etc/rc.d/accounting ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/accounting Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/accounting Wed Feb 29 01:04:37 2012 (r232280) @@ -11,7 +11,7 @@ . /etc/rc.subr name="accounting" -rcvar=`set_rcvar` +rcvar="accounting_enable" accounting_command="/usr/sbin/accton" accounting_file="/var/account/acct" Modified: projects/multi-fibv6/9/etc/rc.d/addswap ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/addswap Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/addswap Wed Feb 29 01:04:37 2012 (r232280) @@ -6,7 +6,7 @@ # # PROVIDE: addswap -# REQUIRE: FILESYSTEMS +# REQUIRE: FILESYSTEMS kld # KEYWORD: nojail . /etc/rc.subr Modified: projects/multi-fibv6/9/etc/rc.d/amd ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/amd Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/amd Wed Feb 29 01:04:37 2012 (r232280) @@ -11,7 +11,7 @@ . /etc/rc.subr name="amd" -rcvar=`set_rcvar` +rcvar="amd_enable" command="/usr/sbin/${name}" start_precmd="amd_precmd" command_args="&" @@ -19,15 +19,8 @@ extra_commands="reload" amd_precmd() { - if ! checkyesno nfs_client_enable; then - force_depend nfsclient || return 1 - fi - - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 - fi + force_depend nfsclient nfs_client || return 1 + force_depend rpcbind || return 1 case ${amd_map_program} in [Nn][Oo] | '') @@ -49,7 +42,6 @@ amd_precmd() command_args="> /var/run/amd.pid 2> /dev/null" ;; esac - return 0 } load_rc_config $name Modified: projects/multi-fibv6/9/etc/rc.d/apm ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/apm Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/apm Wed Feb 29 01:04:37 2012 (r232280) @@ -11,7 +11,7 @@ . /etc/rc.subr name="apm" -rcvar=`set_rcvar` +rcvar="apm_enable" start_precmd="apm_precmd" command="/usr/sbin/${name}" start_cmd="${command} -e enable" Modified: projects/multi-fibv6/9/etc/rc.d/apmd ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/apmd Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/apmd Wed Feb 29 01:04:37 2012 (r232280) @@ -11,7 +11,7 @@ . /etc/rc.subr name="apmd" -rcvar=`set_rcvar` +rcvar="apmd_enable" command="/usr/sbin/${name}" start_precmd="apmd_prestart" @@ -19,24 +19,18 @@ apmd_prestart() { case `${SYSCTL_N} hw.machine_arch` in i386) - # Enable apm if it is not already enabled - if ! checkyesno apm_enable && \ - ! /etc/rc.d/apm forcestatus 1>/dev/null 2>&1 - then - force_depend apm || return 1 - fi + force_depend apm || return 1 # Warn user about acpi apm compatibility support which # does not work with apmd. if [ ! -e /dev/apmctl ]; then - warn "/dev/apmctl not found; kernel is missing apm(4)" + warn "/dev/apmctl not found; kernel is missing apm(4)" fi ;; *) return 1 ;; esac - return 0 } load_rc_config $name Modified: projects/multi-fibv6/9/etc/rc.d/bootparams ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/bootparams Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/bootparams Wed Feb 29 01:04:37 2012 (r232280) @@ -11,7 +11,7 @@ . /etc/rc.subr name="bootparamd" -rcvar=`set_rcvar` +rcvar="bootparamd_enable" required_files="/etc/bootparams" command="/usr/sbin/${name}" Modified: projects/multi-fibv6/9/etc/rc.d/bsnmpd ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/bsnmpd Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/bsnmpd Wed Feb 29 01:04:37 2012 (r232280) @@ -10,7 +10,7 @@ . /etc/rc.subr name="bsnmpd" -rcvar=`set_rcvar` +rcvar="bsnmpd_enable" command="/usr/sbin/${name}" pidfile="/var/run/snmpd.pid" Modified: projects/multi-fibv6/9/etc/rc.d/bthidd ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/bthidd Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/bthidd Wed Feb 29 01:04:37 2012 (r232280) @@ -11,9 +11,9 @@ . /etc/rc.subr name="bthidd" +rcvar="bthidd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" -rcvar=`set_rcvar` start_precmd="bthidd_prestart" bthidd_prestart() Modified: projects/multi-fibv6/9/etc/rc.d/cleanvar ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/cleanvar Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/cleanvar Wed Feb 29 01:04:37 2012 (r232280) @@ -9,7 +9,7 @@ . /etc/rc.subr name="cleanvar" -rcvar=`set_rcvar` +rcvar="cleanvar_enable" start_precmd="${name}_prestart" start_cmd="${name}_start" Modified: projects/multi-fibv6/9/etc/rc.d/cleartmp ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/cleartmp Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/cleartmp Wed Feb 29 01:04:37 2012 (r232280) @@ -11,7 +11,7 @@ name="cleartmp" # Disguise rcvar for the start method to run irrespective of its setting. -rcvar1=`set_rcvar clear_tmp` +rcvar1="clear_tmp_enable" start_cmd="${name}_start" stop_cmd=":" Modified: projects/multi-fibv6/9/etc/rc.d/cron ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/cron Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/cron Wed Feb 29 01:04:37 2012 (r232280) @@ -11,7 +11,7 @@ . /etc/rc.subr name="cron" -rcvar="`set_rcvar`" +rcvar="cron_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" Modified: projects/multi-fibv6/9/etc/rc.d/ddb ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/ddb Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/ddb Wed Feb 29 01:04:37 2012 (r232280) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ddb" -rcvar=`set_rcvar` +rcvar="ddb_enable" command="/sbin/${name}" start_precmd="ddb_prestart" stop_cmd=":" Modified: projects/multi-fibv6/9/etc/rc.d/devd ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/devd Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/devd Wed Feb 29 01:04:37 2012 (r232280) @@ -11,7 +11,7 @@ . /etc/rc.subr name="devd" -rcvar=`set_rcvar` +rcvar="devd_enable" command="/sbin/${name}" start_precmd=${name}_prestart Modified: projects/multi-fibv6/9/etc/rc.d/devfs ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/devfs Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/devfs Wed Feb 29 01:04:37 2012 (r232280) @@ -16,7 +16,8 @@ stop_cmd=':' devfs_start() { - if [ -n "$devfs_system_ruleset" -o -n "$devfs_set_rulesets" ]; then + if [ -n "$devfs_system_ruleset" -o -n "$devfs_set_rulesets" ] || + checkyesno devfs_load_rulesets; then devfs_init_rulesets if [ -n "$devfs_system_ruleset" ]; then devfs_set_ruleset $devfs_system_ruleset /dev Modified: projects/multi-fibv6/9/etc/rc.d/dhclient ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/dhclient Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/dhclient Wed Feb 29 01:04:37 2012 (r232280) @@ -22,7 +22,14 @@ stop_precmd="dhclient_pre_check" dhclient_pre_check() { if [ -z "${rc_force}" ] && ! dhcpif $ifn; then - err 1 "'$ifn' is not a DHCP-enabled interface" + local msg + msg="'$ifn' is not a DHCP-enabled interface" + if [ -z "${rc_quiet}" ]; then + echo "$msg" + else + debug "$msg" + fi + exit 1 fi } Modified: projects/multi-fibv6/9/etc/rc.d/dmesg ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/dmesg Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/dmesg Wed Feb 29 01:04:37 2012 (r232280) @@ -11,7 +11,7 @@ . /etc/rc.subr name="dmesg" -rcvar=`set_rcvar` +rcvar="dmesg_enable" dmesg_file="/var/run/dmesg.boot" start_cmd="do_dmesg" stop_cmd=":" Modified: projects/multi-fibv6/9/etc/rc.d/ftp-proxy ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/ftp-proxy Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/ftp-proxy Wed Feb 29 01:04:37 2012 (r232280) @@ -10,7 +10,7 @@ . /etc/rc.subr name="ftpproxy" -rcvar=`set_rcvar` +rcvar="ftpproxy_enable" command="/usr/sbin/ftp-proxy" load_rc_config $name Modified: projects/multi-fibv6/9/etc/rc.d/ftpd ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/ftpd Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/ftpd Wed Feb 29 01:04:37 2012 (r232280) @@ -10,7 +10,7 @@ . /etc/rc.subr name="ftpd" -rcvar=`set_rcvar` +rcvar="ftpd_enable" command="/usr/libexec/${name}" pidfile="/var/run/${name}.pid" start_precmd=ftpd_prestart Modified: projects/multi-fibv6/9/etc/rc.d/gptboot ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/gptboot Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/gptboot Wed Feb 29 01:04:37 2012 (r232280) @@ -34,7 +34,7 @@ . /etc/rc.subr name="gptboot" -rcvar=`set_rcvar` +rcvar="gptboot_enable" start_cmd="gptboot_report" gptboot_report() Modified: projects/multi-fibv6/9/etc/rc.d/hastd ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/hastd Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/hastd Wed Feb 29 01:04:37 2012 (r232280) @@ -11,7 +11,7 @@ . /etc/rc.subr name="hastd" -rcvar=`set_rcvar` +rcvar="hastd_enable" pidfile="/var/run/${name}.pid" command="/sbin/${name}" hastctl="/sbin/hastctl" Modified: projects/multi-fibv6/9/etc/rc.d/hcsecd ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/hcsecd Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/hcsecd Wed Feb 29 01:04:37 2012 (r232280) @@ -11,9 +11,9 @@ . /etc/rc.subr name="hcsecd" +rcvar="hcsecd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" -rcvar=`set_rcvar` required_modules="ng_btsocket" load_rc_config $name Modified: projects/multi-fibv6/9/etc/rc.d/hostapd ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/hostapd Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/hostapd Wed Feb 29 01:04:37 2012 (r232280) @@ -10,8 +10,8 @@ . /etc/rc.subr name="hostapd" +rcvar="hostapd_enable" command="/usr/sbin/${name}" -rcvar=`set_rcvar` conf_file="/etc/${name}.conf" pidfile="/var/run/${name}.pid" Modified: projects/multi-fibv6/9/etc/rc.d/inetd ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/inetd Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/inetd Wed Feb 29 01:04:37 2012 (r232280) @@ -10,7 +10,7 @@ . /etc/rc.subr name="inetd" -rcvar=`set_rcvar` +rcvar="inetd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/${name}.conf" Modified: projects/multi-fibv6/9/etc/rc.d/ip6addrctl ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/ip6addrctl Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/ip6addrctl Wed Feb 29 01:04:37 2012 (r232280) @@ -12,7 +12,7 @@ . /etc/network.subr name="ip6addrctl" -rcvar=`set_rcvar` +rcvar="ip6addrctl_enable" start_cmd="ip6addrctl_start" stop_cmd="ip6addrctl_stop" extra_commands="status prefer_ipv6 prefer_ipv4" Modified: projects/multi-fibv6/9/etc/rc.d/ipfilter ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/ipfilter Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/ipfilter Wed Feb 29 01:04:37 2012 (r232280) @@ -10,7 +10,7 @@ . /etc/rc.subr name="ipfilter" -rcvar=`set_rcvar` +rcvar="ipfilter_enable" load_rc_config $name stop_precmd="test -f ${ipfilter_rules} -o -f ${ipv6_ipfilter_rules}" Modified: projects/multi-fibv6/9/etc/rc.d/ipfs ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/ipfs Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/ipfs Wed Feb 29 01:04:37 2012 (r232280) @@ -10,7 +10,7 @@ . /etc/rc.subr name="ipfs" -rcvar=`set_rcvar` +rcvar="ipfs_enable" start_cmd="ipfs_start" stop_cmd="ipfs_stop" start_precmd="ipfs_prestart" Modified: projects/multi-fibv6/9/etc/rc.d/ipmon ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/ipmon Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/ipmon Wed Feb 29 01:04:37 2012 (r232280) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ipmon" -rcvar=`set_rcvar` +rcvar="ipmon_enable" command="/sbin/${name}" start_precmd="ipmon_precmd" Modified: projects/multi-fibv6/9/etc/rc.d/ipnat ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/ipnat Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/ipnat Wed Feb 29 01:04:37 2012 (r232280) @@ -10,7 +10,7 @@ . /etc/rc.subr name="ipnat" -rcvar=`set_rcvar` +rcvar="ipnat_enable" load_rc_config $name start_cmd="ipnat_start" stop_cmd="${ipnat_program} -F -C" Modified: projects/multi-fibv6/9/etc/rc.d/ipsec ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/ipsec Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/ipsec Wed Feb 29 01:04:37 2012 (r232280) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ipsec" -rcvar=`set_rcvar` +rcvar="ipsec_enable" start_precmd="ipsec_prestart" start_cmd="ipsec_start" stop_precmd="test -f $ipsec_file" Modified: projects/multi-fibv6/9/etc/rc.d/ipxrouted ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/ipxrouted Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/ipxrouted Wed Feb 29 01:04:37 2012 (r232280) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ipxrouted" -rcvar=`set_rcvar` +rcvar="ipxrouted_enable" command="/usr/sbin/IPXrouted" command_args="> /dev/null 2>&1" Modified: projects/multi-fibv6/9/etc/rc.d/jail ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/jail Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/jail Wed Feb 29 01:04:37 2012 (r232280) @@ -17,7 +17,7 @@ . /etc/rc.subr name="jail" -rcvar=`set_rcvar` +rcvar="jail_enable" start_precmd="jail_prestart" start_cmd="jail_start" Modified: projects/multi-fibv6/9/etc/rc.d/keyserv ============================================================================== --- projects/multi-fibv6/9/etc/rc.d/keyserv Wed Feb 29 00:52:56 2012 (r232279) +++ projects/multi-fibv6/9/etc/rc.d/keyserv Wed Feb 29 01:04:37 2012 (r232280) @@ -13,19 +13,13 @@ . /etc/rc.subr name="keyserv" -rcvar=`set_rcvar` +rcvar="keyserv_enable" command="/usr/sbin/${name}" start_precmd="keyserv_prestart" keyserv_prestart() { - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202290104.q1T14cfo000243>