Date: Fri, 17 Feb 2012 13:42:51 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r231877 - in projects/multi-fibv6/8: . etc etc/defaults etc/periodic/daily etc/rc.d gnu/usr.bin/groff/tmac include/rpc include/rpcsvc lib/libc/gen lib/libc/rpc lib/libc/yp lib/libelf li... Message-ID: <201202171342.q1HDgpOd080590@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Fri Feb 17 13:42:50 2012 New Revision: 231877 URL: http://svn.freebsd.org/changeset/base/231877 Log: IF8 to 8.3-PRERELEASE. Adjust multi-FIB relevant changes in startup scripts after the merge of r231803. Sponsored by: Cisco Systems, Inc. Added: projects/multi-fibv6/8/share/man/man4/isci.4 - copied unchanged from r231871, stable/8/share/man/man4/isci.4 projects/multi-fibv6/8/share/man/man4/netmap.4 - copied unchanged from r231871, stable/8/share/man/man4/netmap.4 projects/multi-fibv6/8/share/man/man4/xnb.4 - copied unchanged from r231871, stable/8/share/man/man4/xnb.4 projects/multi-fibv6/8/sys/dev/isci/ - copied from r231871, stable/8/sys/dev/isci/ projects/multi-fibv6/8/sys/dev/netmap/ - copied from r231871, stable/8/sys/dev/netmap/ projects/multi-fibv6/8/sys/dev/oce/ - copied from r231871, stable/8/sys/dev/oce/ projects/multi-fibv6/8/sys/dev/xen/netback/netback_unit_tests.c - copied unchanged from r231871, stable/8/sys/dev/xen/netback/netback_unit_tests.c projects/multi-fibv6/8/sys/libkern/strnlen.c - copied unchanged from r231871, stable/8/sys/libkern/strnlen.c projects/multi-fibv6/8/sys/modules/isci/ - copied from r231871, stable/8/sys/modules/isci/ projects/multi-fibv6/8/sys/modules/oce/ - copied from r231871, stable/8/sys/modules/oce/ projects/multi-fibv6/8/sys/net/netmap.h - copied unchanged from r231871, stable/8/sys/net/netmap.h projects/multi-fibv6/8/sys/net/netmap_user.h - copied unchanged from r231871, stable/8/sys/net/netmap_user.h projects/multi-fibv6/8/tools/tools/netmap/ - copied from r231871, stable/8/tools/tools/netmap/ - copied from r231871, stable/8/usr.sbin/rtadvctl/ projects/multi-fibv6/8/usr.sbin/rtadvd/control.c - copied unchanged from r231871, stable/8/usr.sbin/rtadvd/control.c projects/multi-fibv6/8/usr.sbin/rtadvd/control.h - copied unchanged from r231871, stable/8/usr.sbin/rtadvd/control.h projects/multi-fibv6/8/usr.sbin/rtadvd/control_client.c - copied unchanged from r231871, stable/8/usr.sbin/rtadvd/control_client.c projects/multi-fibv6/8/usr.sbin/rtadvd/control_client.h - copied unchanged from r231871, stable/8/usr.sbin/rtadvd/control_client.h projects/multi-fibv6/8/usr.sbin/rtadvd/control_server.c - copied unchanged from r231871, stable/8/usr.sbin/rtadvd/control_server.c projects/multi-fibv6/8/usr.sbin/rtadvd/control_server.h - copied unchanged from r231871, stable/8/usr.sbin/rtadvd/control_server.h projects/multi-fibv6/8/usr.sbin/rtadvd/timer_subr.c - copied unchanged from r231871, stable/8/usr.sbin/rtadvd/timer_subr.c projects/multi-fibv6/8/usr.sbin/rtadvd/timer_subr.h - copied unchanged from r231871, stable/8/usr.sbin/rtadvd/timer_subr.h Directory Properties: projects/multi-fibv6/8/usr.sbin/rtadvctl/ (props changed) Deleted: projects/multi-fibv6/8/usr.sbin/rtadvd/dump.c projects/multi-fibv6/8/usr.sbin/rtadvd/dump.h Modified: projects/multi-fibv6/8/MAINTAINERS (contents, props changed) projects/multi-fibv6/8/etc/defaults/periodic.conf projects/multi-fibv6/8/etc/defaults/rc.conf projects/multi-fibv6/8/etc/periodic/daily/404.status-zfs projects/multi-fibv6/8/etc/rc.d/SERVERS projects/multi-fibv6/8/etc/rc.d/accounting projects/multi-fibv6/8/etc/rc.d/addswap projects/multi-fibv6/8/etc/rc.d/amd projects/multi-fibv6/8/etc/rc.d/apm projects/multi-fibv6/8/etc/rc.d/apmd projects/multi-fibv6/8/etc/rc.d/bootparams projects/multi-fibv6/8/etc/rc.d/bsnmpd projects/multi-fibv6/8/etc/rc.d/bthidd projects/multi-fibv6/8/etc/rc.d/cleanvar projects/multi-fibv6/8/etc/rc.d/cleartmp projects/multi-fibv6/8/etc/rc.d/cron projects/multi-fibv6/8/etc/rc.d/ddb projects/multi-fibv6/8/etc/rc.d/devd projects/multi-fibv6/8/etc/rc.d/devfs projects/multi-fibv6/8/etc/rc.d/dhclient projects/multi-fibv6/8/etc/rc.d/dmesg projects/multi-fibv6/8/etc/rc.d/ftp-proxy projects/multi-fibv6/8/etc/rc.d/ftpd projects/multi-fibv6/8/etc/rc.d/gptboot projects/multi-fibv6/8/etc/rc.d/hastd projects/multi-fibv6/8/etc/rc.d/hcsecd projects/multi-fibv6/8/etc/rc.d/hostapd projects/multi-fibv6/8/etc/rc.d/inetd projects/multi-fibv6/8/etc/rc.d/ip6addrctl projects/multi-fibv6/8/etc/rc.d/ipfilter projects/multi-fibv6/8/etc/rc.d/ipfs projects/multi-fibv6/8/etc/rc.d/ipmon projects/multi-fibv6/8/etc/rc.d/ipnat projects/multi-fibv6/8/etc/rc.d/ipsec projects/multi-fibv6/8/etc/rc.d/ipxrouted projects/multi-fibv6/8/etc/rc.d/jail projects/multi-fibv6/8/etc/rc.d/keyserv projects/multi-fibv6/8/etc/rc.d/lockd projects/multi-fibv6/8/etc/rc.d/lpd projects/multi-fibv6/8/etc/rc.d/mountd projects/multi-fibv6/8/etc/rc.d/moused projects/multi-fibv6/8/etc/rc.d/mroute6d projects/multi-fibv6/8/etc/rc.d/mrouted projects/multi-fibv6/8/etc/rc.d/natd projects/multi-fibv6/8/etc/rc.d/netwait projects/multi-fibv6/8/etc/rc.d/network_ipv6 projects/multi-fibv6/8/etc/rc.d/newsyslog projects/multi-fibv6/8/etc/rc.d/nfscbd projects/multi-fibv6/8/etc/rc.d/nfsd projects/multi-fibv6/8/etc/rc.d/nfsuserd projects/multi-fibv6/8/etc/rc.d/nscd projects/multi-fibv6/8/etc/rc.d/ntpd projects/multi-fibv6/8/etc/rc.d/ntpdate projects/multi-fibv6/8/etc/rc.d/pf projects/multi-fibv6/8/etc/rc.d/pflog projects/multi-fibv6/8/etc/rc.d/pfsync projects/multi-fibv6/8/etc/rc.d/powerd projects/multi-fibv6/8/etc/rc.d/ppp projects/multi-fibv6/8/etc/rc.d/pppoed projects/multi-fibv6/8/etc/rc.d/quota projects/multi-fibv6/8/etc/rc.d/rarpd projects/multi-fibv6/8/etc/rc.d/rfcomm_pppd_server projects/multi-fibv6/8/etc/rc.d/route6d projects/multi-fibv6/8/etc/rc.d/routed projects/multi-fibv6/8/etc/rc.d/routing projects/multi-fibv6/8/etc/rc.d/rpcbind projects/multi-fibv6/8/etc/rc.d/rtadvd projects/multi-fibv6/8/etc/rc.d/rtsold projects/multi-fibv6/8/etc/rc.d/rwho projects/multi-fibv6/8/etc/rc.d/sdpd projects/multi-fibv6/8/etc/rc.d/sendmail projects/multi-fibv6/8/etc/rc.d/sshd projects/multi-fibv6/8/etc/rc.d/statd projects/multi-fibv6/8/etc/rc.d/syslogd projects/multi-fibv6/8/etc/rc.d/timed projects/multi-fibv6/8/etc/rc.d/ubthidhci projects/multi-fibv6/8/etc/rc.d/var projects/multi-fibv6/8/etc/rc.d/virecover projects/multi-fibv6/8/etc/rc.d/watchdogd projects/multi-fibv6/8/etc/rc.d/ypbind projects/multi-fibv6/8/etc/rc.d/yppasswdd projects/multi-fibv6/8/etc/rc.d/ypserv projects/multi-fibv6/8/etc/rc.d/ypset projects/multi-fibv6/8/etc/rc.d/ypupdated projects/multi-fibv6/8/etc/rc.d/ypxfrd projects/multi-fibv6/8/etc/rc.subr projects/multi-fibv6/8/gnu/usr.bin/groff/tmac/mdoc.local projects/multi-fibv6/8/include/rpc/Makefile projects/multi-fibv6/8/include/rpcsvc/Makefile projects/multi-fibv6/8/lib/libc/gen/sysctl.3 projects/multi-fibv6/8/lib/libc/rpc/Makefile.inc projects/multi-fibv6/8/lib/libc/yp/Makefile.inc projects/multi-fibv6/8/lib/libelf/elf_data.c projects/multi-fibv6/8/lib/libelf/elf_getdata.3 projects/multi-fibv6/8/lib/libipsec/pfkey.c projects/multi-fibv6/8/lib/librpcsvc/Makefile projects/multi-fibv6/8/lib/libypclnt/Makefile projects/multi-fibv6/8/libexec/ypxfr/Makefile projects/multi-fibv6/8/release/Makefile projects/multi-fibv6/8/release/picobsd/tinyware/passwd/Makefile projects/multi-fibv6/8/sbin/hastd/rangelock.c projects/multi-fibv6/8/sbin/ifconfig/ifconfig.c projects/multi-fibv6/8/share/man/man4/Makefile projects/multi-fibv6/8/share/man/man4/ada.4 projects/multi-fibv6/8/share/man/man4/bge.4 projects/multi-fibv6/8/share/man/man4/cd.4 projects/multi-fibv6/8/share/man/man4/da.4 projects/multi-fibv6/8/share/man/man4/lmc.4 projects/multi-fibv6/8/share/man/man4/sbp.4 projects/multi-fibv6/8/share/man/man4/u3g.4 projects/multi-fibv6/8/share/man/man4/usb_quirk.4 projects/multi-fibv6/8/share/man/man5/periodic.conf.5 projects/multi-fibv6/8/share/man/man5/portindex.5 projects/multi-fibv6/8/share/man/man5/rc.conf.5 projects/multi-fibv6/8/share/man/man7/security.7 projects/multi-fibv6/8/share/man/man8/rc.subr.8 projects/multi-fibv6/8/share/man/man9/DEVICE_PROBE.9 projects/multi-fibv6/8/sys/amd64/conf/GENERIC projects/multi-fibv6/8/sys/amd64/conf/NOTES projects/multi-fibv6/8/sys/amd64/conf/XENHVM projects/multi-fibv6/8/sys/conf/NOTES projects/multi-fibv6/8/sys/conf/files projects/multi-fibv6/8/sys/conf/files.amd64 projects/multi-fibv6/8/sys/conf/files.i386 projects/multi-fibv6/8/sys/conf/newvers.sh projects/multi-fibv6/8/sys/conf/options projects/multi-fibv6/8/sys/conf/options.amd64 projects/multi-fibv6/8/sys/conf/options.i386 projects/multi-fibv6/8/sys/dev/acpica/acpi.c projects/multi-fibv6/8/sys/dev/ata/ata-queue.c projects/multi-fibv6/8/sys/dev/bge/if_bge.c projects/multi-fibv6/8/sys/dev/bge/if_bgereg.h projects/multi-fibv6/8/sys/dev/esp/ncr53c9x.c projects/multi-fibv6/8/sys/dev/et/if_et.c projects/multi-fibv6/8/sys/dev/mps/mps.c projects/multi-fibv6/8/sys/dev/mps/mps_pci.c projects/multi-fibv6/8/sys/dev/mps/mps_sas.c projects/multi-fibv6/8/sys/dev/mps/mps_sas.h projects/multi-fibv6/8/sys/dev/mps/mps_sas_lsi.c projects/multi-fibv6/8/sys/dev/mps/mps_user.c projects/multi-fibv6/8/sys/dev/mps/mpsvar.h projects/multi-fibv6/8/sys/dev/re/if_re.c projects/multi-fibv6/8/sys/dev/sound/pcm/sound.c projects/multi-fibv6/8/sys/dev/twa/tw_osl.h projects/multi-fibv6/8/sys/dev/xen/balloon/balloon.c projects/multi-fibv6/8/sys/dev/xen/blkback/blkback.c projects/multi-fibv6/8/sys/dev/xen/blkfront/blkfront.c projects/multi-fibv6/8/sys/dev/xen/blkfront/block.h projects/multi-fibv6/8/sys/dev/xen/console/console.c projects/multi-fibv6/8/sys/dev/xen/control/control.c projects/multi-fibv6/8/sys/dev/xen/netback/netback.c projects/multi-fibv6/8/sys/dev/xen/netfront/netfront.c projects/multi-fibv6/8/sys/dev/xen/xenpci/evtchn.c projects/multi-fibv6/8/sys/fs/nfsserver/nfs_nfsdport.c projects/multi-fibv6/8/sys/fs/tmpfs/tmpfs_vnops.c projects/multi-fibv6/8/sys/i386/conf/GENERIC projects/multi-fibv6/8/sys/i386/conf/NOTES projects/multi-fibv6/8/sys/i386/include/pcpu.h projects/multi-fibv6/8/sys/i386/include/pmap.h projects/multi-fibv6/8/sys/i386/include/xen/hypercall.h projects/multi-fibv6/8/sys/i386/include/xen/xen-os.h projects/multi-fibv6/8/sys/i386/include/xen/xenpmap.h projects/multi-fibv6/8/sys/i386/include/xen/xenvar.h projects/multi-fibv6/8/sys/i386/xen/xen_machdep.c projects/multi-fibv6/8/sys/kern/kern_subr.c projects/multi-fibv6/8/sys/kern/subr_scanf.c projects/multi-fibv6/8/sys/kern/uipc_mbuf.c projects/multi-fibv6/8/sys/modules/Makefile projects/multi-fibv6/8/sys/modules/kgssapi/Makefile projects/multi-fibv6/8/sys/modules/kgssapi_krb5/Makefile projects/multi-fibv6/8/sys/net/if.h projects/multi-fibv6/8/sys/net/if_var.h projects/multi-fibv6/8/sys/net/route.c projects/multi-fibv6/8/sys/net/rtsock.c projects/multi-fibv6/8/sys/netgraph/netgraph.h projects/multi-fibv6/8/sys/netgraph/ng_base.c projects/multi-fibv6/8/sys/netgraph/ng_cisco.c projects/multi-fibv6/8/sys/netgraph/ng_cisco.h projects/multi-fibv6/8/sys/netgraph/ng_socket.c projects/multi-fibv6/8/sys/netgraph/ng_socketvar.h projects/multi-fibv6/8/sys/netinet/icmp6.h projects/multi-fibv6/8/sys/netinet/in.c projects/multi-fibv6/8/sys/netinet6/nd6.h projects/multi-fibv6/8/sys/netinet6/nd6_rtr.c projects/multi-fibv6/8/sys/nfsserver/nfs_serv.c projects/multi-fibv6/8/sys/pc98/conf/GENERIC projects/multi-fibv6/8/sys/sys/eventhandler.h projects/multi-fibv6/8/sys/sys/libkern.h projects/multi-fibv6/8/sys/sys/param.h projects/multi-fibv6/8/sys/sys/socket.h projects/multi-fibv6/8/sys/xen/interface/io/netif.h projects/multi-fibv6/8/sys/xen/interface/io/xenbus.h projects/multi-fibv6/8/sys/xen/xenbus/xenbus.c projects/multi-fibv6/8/sys/xen/xenbus/xenbus_if.m projects/multi-fibv6/8/sys/xen/xenbus/xenbusb.c projects/multi-fibv6/8/sys/xen/xenbus/xenbusb.h projects/multi-fibv6/8/sys/xen/xenbus/xenbusb_back.c projects/multi-fibv6/8/sys/xen/xenbus/xenbusb_front.c projects/multi-fibv6/8/sys/xen/xenbus/xenbusb_if.m projects/multi-fibv6/8/sys/xen/xenbus/xenbusvar.h projects/multi-fibv6/8/sys/xen/xenstore/xenstore.c projects/multi-fibv6/8/sys/xen/xenstore/xenstorevar.h projects/multi-fibv6/8/usr.bin/sockstat/sockstat.1 projects/multi-fibv6/8/usr.bin/sockstat/sockstat.c projects/multi-fibv6/8/usr.sbin/Makefile (contents, props changed) projects/multi-fibv6/8/usr.sbin/amd/Makefile.inc projects/multi-fibv6/8/usr.sbin/bootparamd/bootparamd/Makefile projects/multi-fibv6/8/usr.sbin/bootparamd/callbootd/Makefile projects/multi-fibv6/8/usr.sbin/gssd/Makefile projects/multi-fibv6/8/usr.sbin/keyserv/Makefile projects/multi-fibv6/8/usr.sbin/rpc.lockd/Makefile projects/multi-fibv6/8/usr.sbin/rpc.statd/Makefile projects/multi-fibv6/8/usr.sbin/rpc.yppasswdd/Makefile projects/multi-fibv6/8/usr.sbin/rpc.ypupdated/Makefile projects/multi-fibv6/8/usr.sbin/rpc.ypxfrd/Makefile projects/multi-fibv6/8/usr.sbin/rtadvd/Makefile projects/multi-fibv6/8/usr.sbin/rtadvd/advcap.c projects/multi-fibv6/8/usr.sbin/rtadvd/config.c projects/multi-fibv6/8/usr.sbin/rtadvd/config.h projects/multi-fibv6/8/usr.sbin/rtadvd/if.c projects/multi-fibv6/8/usr.sbin/rtadvd/if.h projects/multi-fibv6/8/usr.sbin/rtadvd/pathnames.h projects/multi-fibv6/8/usr.sbin/rtadvd/rrenum.c projects/multi-fibv6/8/usr.sbin/rtadvd/rrenum.h projects/multi-fibv6/8/usr.sbin/rtadvd/rtadvd.8 projects/multi-fibv6/8/usr.sbin/rtadvd/rtadvd.c projects/multi-fibv6/8/usr.sbin/rtadvd/rtadvd.conf projects/multi-fibv6/8/usr.sbin/rtadvd/rtadvd.conf.5 projects/multi-fibv6/8/usr.sbin/rtadvd/rtadvd.h projects/multi-fibv6/8/usr.sbin/rtadvd/timer.c projects/multi-fibv6/8/usr.sbin/rtadvd/timer.h projects/multi-fibv6/8/usr.sbin/yppush/Makefile projects/multi-fibv6/8/usr.sbin/ypserv/Makefile Directory Properties: projects/multi-fibv6/8/ (props changed) projects/multi-fibv6/8/etc/ (props changed) projects/multi-fibv6/8/gnu/ (props changed) projects/multi-fibv6/8/gnu/usr.bin/ (props changed) projects/multi-fibv6/8/gnu/usr.bin/groff/ (props changed) projects/multi-fibv6/8/include/ (props changed) projects/multi-fibv6/8/lib/ (props changed) projects/multi-fibv6/8/lib/libc/ (props changed) projects/multi-fibv6/8/lib/libelf/ (props changed) projects/multi-fibv6/8/lib/libipsec/ (props changed) projects/multi-fibv6/8/lib/librpcsvc/ (props changed) projects/multi-fibv6/8/lib/libypclnt/ (props changed) projects/multi-fibv6/8/libexec/ (props changed) projects/multi-fibv6/8/libexec/ypxfr/ (props changed) projects/multi-fibv6/8/release/ (props changed) projects/multi-fibv6/8/release/picobsd/ (props changed) projects/multi-fibv6/8/release/picobsd/tinyware/passwd/ (props changed) projects/multi-fibv6/8/sbin/ (props changed) projects/multi-fibv6/8/sbin/hastd/ (props changed) projects/multi-fibv6/8/sbin/ifconfig/ (props changed) projects/multi-fibv6/8/share/ (props changed) projects/multi-fibv6/8/share/man/ (props changed) projects/multi-fibv6/8/share/man/man4/ (props changed) projects/multi-fibv6/8/share/man/man5/ (props changed) projects/multi-fibv6/8/share/man/man7/ (props changed) projects/multi-fibv6/8/share/man/man8/ (props changed) projects/multi-fibv6/8/share/man/man9/ (props changed) projects/multi-fibv6/8/sys/ (props changed) projects/multi-fibv6/8/sys/amd64/include/xen/ (props changed) projects/multi-fibv6/8/sys/boot/ (props changed) projects/multi-fibv6/8/sys/cddl/contrib/opensolaris/ (props changed) projects/multi-fibv6/8/sys/contrib/dev/acpica/ (props changed) projects/multi-fibv6/8/sys/contrib/pf/ (props changed) projects/multi-fibv6/8/sys/dev/e1000/ (props changed) projects/multi-fibv6/8/tools/ (props changed) projects/multi-fibv6/8/tools/tools/ (props changed) projects/multi-fibv6/8/usr.bin/ (props changed) projects/multi-fibv6/8/usr.bin/sockstat/ (props changed) projects/multi-fibv6/8/usr.sbin/ (props changed) projects/multi-fibv6/8/usr.sbin/amd/ (props changed) projects/multi-fibv6/8/usr.sbin/bootparamd/ (props changed) projects/multi-fibv6/8/usr.sbin/gssd/ (props changed) projects/multi-fibv6/8/usr.sbin/keyserv/ (props changed) projects/multi-fibv6/8/usr.sbin/rpc.lockd/ (props changed) projects/multi-fibv6/8/usr.sbin/rpc.statd/ (props changed) projects/multi-fibv6/8/usr.sbin/rpc.yppasswdd/ (props changed) projects/multi-fibv6/8/usr.sbin/rpc.ypupdated/ (props changed) projects/multi-fibv6/8/usr.sbin/rpc.ypxfrd/ (props changed) projects/multi-fibv6/8/usr.sbin/rtadvd/ (props changed) projects/multi-fibv6/8/usr.sbin/yppush/ (props changed) projects/multi-fibv6/8/usr.sbin/ypserv/ (props changed) Modified: projects/multi-fibv6/8/MAINTAINERS ============================================================================== --- projects/multi-fibv6/8/MAINTAINERS Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/MAINTAINERS Fri Feb 17 13:42:50 2012 (r231877) @@ -124,6 +124,7 @@ usr.bin/bluetooth emax Pre-commit review usr.sbin/bluetooth emax Pre-commit review preferred. gnu/usr.bin/send-pr bugmaster Pre-commit review requested. ncurses rafan Heads-up appreciated, try not to break it. +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/8/etc/defaults/periodic.conf ============================================================================== --- projects/multi-fibv6/8/etc/defaults/periodic.conf Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/defaults/periodic.conf Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/defaults/rc.conf ============================================================================== --- projects/multi-fibv6/8/etc/defaults/rc.conf Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/defaults/rc.conf Fri Feb 17 13:42:50 2012 (r231877) @@ -29,6 +29,8 @@ early_late_divider="FILESYSTEMS" # Scrip # 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). @@ -634,6 +636,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/8/etc/periodic/daily/404.status-zfs ============================================================================== --- projects/multi-fibv6/8/etc/periodic/daily/404.status-zfs Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/periodic/daily/404.status-zfs Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/SERVERS ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/SERVERS Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/SERVERS Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/accounting ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/accounting Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/accounting Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/addswap ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/addswap Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/addswap Fri Feb 17 13:42:50 2012 (r231877) @@ -6,7 +6,7 @@ # # PROVIDE: addswap -# REQUIRE: FILESYSTEMS +# REQUIRE: FILESYSTEMS kld # KEYWORD: nojail . /etc/rc.subr Modified: projects/multi-fibv6/8/etc/rc.d/amd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/amd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/amd Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/apm ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/apm Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/apm Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/apmd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/apmd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/apmd Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/bootparams ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/bootparams Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/bootparams Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/bsnmpd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/bsnmpd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/bsnmpd Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/bthidd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/bthidd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/bthidd Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/cleanvar ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/cleanvar Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/cleanvar Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/cleartmp ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/cleartmp Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/cleartmp Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/cron ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/cron Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/cron Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/ddb ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/ddb Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/ddb Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/devd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/devd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/devd Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/devfs ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/devfs Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/devfs Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/dhclient ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/dhclient Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/dhclient Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/dmesg ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/dmesg Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/dmesg Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/ftp-proxy ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/ftp-proxy Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/ftp-proxy Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/ftpd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/ftpd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/ftpd Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/gptboot ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/gptboot Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/gptboot Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/hastd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/hastd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/hastd Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/hcsecd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/hcsecd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/hcsecd Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/hostapd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/hostapd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/hostapd Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/inetd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/inetd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/inetd Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/ip6addrctl ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/ip6addrctl Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/ip6addrctl Fri Feb 17 13:42:50 2012 (r231877) @@ -11,7 +11,7 @@ . /etc/rc.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/8/etc/rc.d/ipfilter ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/ipfilter Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/ipfilter Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/ipfs ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/ipfs Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/ipfs Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/ipmon ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/ipmon Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/ipmon Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/ipnat ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/ipnat Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/ipnat Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/ipsec ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/ipsec Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/ipsec Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/ipxrouted ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/ipxrouted Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/ipxrouted Fri Feb 17 13:42:50 2012 (r231877) @@ -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/8/etc/rc.d/jail ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/jail Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/jail Fri Feb 17 13:42:50 2012 (r231877) @@ -17,7 +17,7 @@ . /etc/rc.subr name="jail" -rcvar=`set_rcvar` +rcvar="jail_enable" start_cmd="jail_start" stop_cmd="jail_stop" Modified: projects/multi-fibv6/8/etc/rc.d/keyserv ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/keyserv Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/keyserv Fri Feb 17 13:42:50 2012 (r231877) @@ -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 - fi - - return 0 + force_depend rpcbind || return 1 } load_rc_config $name Modified: projects/multi-fibv6/8/etc/rc.d/lockd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/lockd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/lockd Fri Feb 17 13:42:50 2012 (r231877) @@ -15,28 +15,16 @@ name="lockd" rcvar=rpc_lockd_enable command="/usr/sbin/rpc.${name}" start_precmd='lockd_precmd' -stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable' -status_precmd=$stop_precmd # Make sure that we are either an NFS client or server, and that we get # the correct flags from rc.conf(5). # lockd_precmd() { - local ret - ret=0 - - if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable - then - ret=1 - fi - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || ret=1 - fi + force_depend rpcbind || return 1 + force_depend statd rpc_statd || return 1 + rc_flags=${rpc_lockd_flags} - return ${ret} } load_rc_config $name Modified: projects/multi-fibv6/8/etc/rc.d/lpd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/lpd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/lpd Fri Feb 17 13:42:50 2012 (r231877) @@ -11,7 +11,7 @@ . /etc/rc.subr name="lpd" -rcvar=`set_rcvar` +rcvar="lpd_enable" command="/usr/sbin/${name}" required_files="/etc/printcap" start_precmd="chkprintcap" Modified: projects/multi-fibv6/8/etc/rc.d/mountd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/mountd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/mountd Fri Feb 17 13:42:50 2012 (r231877) @@ -10,7 +10,7 @@ . /etc/rc.subr name="mountd" -rcvar=`set_rcvar` +rcvar="mountd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/exports" @@ -19,11 +19,7 @@ extra_commands="reload" mountd_precmd() { - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 - fi + force_depend rpcbind || return 1 # mountd flags will differ depending on rc.conf settings # @@ -49,8 +45,8 @@ mountd_precmd() fi rm -f /var/db/mountdtab - ( umask 022 ; > /var/db/mountdtab ) - return 0 + ( umask 022 ; > /var/db/mountdtab ) || + err 1 'Cannot create /var/db/mountdtab' } load_rc_config $name Modified: projects/multi-fibv6/8/etc/rc.d/moused ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/moused Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/moused Fri Feb 17 13:42:50 2012 (r231877) @@ -10,7 +10,7 @@ . /etc/rc.subr name="moused" -rcvar=`set_rcvar` +rcvar="moused_enable" command="/usr/sbin/${name}" start_cmd="moused_start" pidprefix="/var/run/moused" @@ -23,7 +23,7 @@ load_rc_config $name # if [ -n "$2" ]; then eval moused_$2_enable=\${moused_$2_enable-${moused_nondefault_enable}} - rcvar=`set_rcvar moused_$2` + rcvar="moused_${2}_enable" pidfile="${pidprefix}.$2.pid" pidarg="-I $pidfile" fi Modified: projects/multi-fibv6/8/etc/rc.d/mroute6d ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/mroute6d Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/mroute6d Fri Feb 17 13:42:50 2012 (r231877) @@ -10,7 +10,7 @@ . /etc/rc.subr name="mroute6d" -rcvar=`set_rcvar` +rcvar="mroute6d_enable" command="/usr/local/sbin/pim6dd" load_rc_config $name Modified: projects/multi-fibv6/8/etc/rc.d/mrouted ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/mrouted Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/mrouted Fri Feb 17 13:42:50 2012 (r231877) @@ -10,7 +10,7 @@ . /etc/rc.subr name="mrouted" -rcvar=`set_rcvar` +rcvar="mrouted_enable" command="/usr/local/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/${name}.conf" Modified: projects/multi-fibv6/8/etc/rc.d/natd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/natd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/natd Fri Feb 17 13:42:50 2012 (r231877) @@ -10,7 +10,7 @@ . /etc/network.subr name="natd" -rcvar=`set_rcvar` +rcvar="natd_enable" command="/sbin/${name}" pidfile="/var/run/${name}.pid" start_precmd="natd_precmd" Modified: projects/multi-fibv6/8/etc/rc.d/netwait ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/netwait Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/netwait Fri Feb 17 13:42:50 2012 (r231877) @@ -14,7 +14,7 @@ . /etc/rc.subr name="netwait" -rcvar=`set_rcvar` +rcvar="netwait_enable" start_cmd="${name}_start" stop_cmd=":" Modified: projects/multi-fibv6/8/etc/rc.d/network_ipv6 ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/network_ipv6 Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/network_ipv6 Fri Feb 17 13:42:50 2012 (r231877) @@ -36,26 +36,11 @@ . /etc/network.subr name="network_ipv6" -rcvar=`set_rcvar ipv6` +rcvar="ipv6_enable" start_cmd="network_ipv6_start" network_ipv6_start() { - local fibs i - - # Get the number of FIBs supported. - fibs=`sysctl -n net.fibs` - : ${fibs:=1} - - # disallow "internal" addresses to appear on the wire - i=0 - while test ${i} -lt ${fibs}; do - setfib -F ${i} route add -inet6 \ - ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject - setfib -F ${i} route add -inet6 \ - ::0.0.0.0 -prefixlen 96 ::1 -reject - i=$((i + 1)) - done case ${ipv6_network_interfaces} in [Aa][Uu][Tt][Oo]) Modified: projects/multi-fibv6/8/etc/rc.d/newsyslog ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/newsyslog Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/newsyslog Fri Feb 17 13:42:50 2012 (r231877) @@ -9,7 +9,7 @@ . /etc/rc.subr name="newsyslog" -rcvar=`set_rcvar` +rcvar="newsyslog_enable" required_files="/etc/newsyslog.conf" command="/usr/sbin/${name}" start_cmd="newsyslog_start" Modified: projects/multi-fibv6/8/etc/rc.d/nfscbd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/nfscbd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/nfscbd Fri Feb 17 13:42:50 2012 (r231877) @@ -10,7 +10,7 @@ . /etc/rc.subr name="nfscbd" -rcvar=`set_rcvar` +rcvar="nfscbd_enable" command="/usr/sbin/${name}" sig_stop="USR1" Modified: projects/multi-fibv6/8/etc/rc.d/nfsd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/nfsd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/nfsd Fri Feb 17 13:42:50 2012 (r231877) @@ -10,7 +10,7 @@ . /etc/rc.subr name="nfsd" -rcvar=`set_rcvar nfs_server` +rcvar="nfs_server_enable" command="/usr/sbin/${name}" load_rc_config $name @@ -43,18 +43,8 @@ nfsd_precmd() fi fi - if ! checkyesno rpcbind_enable && \ - ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1 - then - force_depend rpcbind || return 1 - fi - - if ! checkyesno mountd_enable && \ - ! /etc/rc.d/mountd forcestatus 1>/dev/null 2>&1 - then - force_depend mountd || return 1 - fi - return 0 + force_depend rpcbind || return 1 + force_depend mountd || return 1 } run_rc_command "$1" Modified: projects/multi-fibv6/8/etc/rc.d/nfsuserd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/nfsuserd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/nfsuserd Fri Feb 17 13:42:50 2012 (r231877) @@ -10,7 +10,7 @@ . /etc/rc.subr name="nfsuserd" -rcvar=`set_rcvar` +rcvar="nfsuserd_enable" command="/usr/sbin/${name}" sig_stop="USR1" Modified: projects/multi-fibv6/8/etc/rc.d/nscd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/nscd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/nscd Fri Feb 17 13:42:50 2012 (r231877) @@ -19,7 +19,7 @@ . /etc/rc.subr name="nscd" -rcvar=`set_rcvar` +rcvar="nscd_enable" command=/usr/sbin/nscd extra_commands="flush" Modified: projects/multi-fibv6/8/etc/rc.d/ntpd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/ntpd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/ntpd Fri Feb 17 13:42:50 2012 (r231877) @@ -11,7 +11,7 @@ . /etc/rc.subr name="ntpd" -rcvar=`set_rcvar` +rcvar="ntpd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" start_precmd="ntpd_precmd" Modified: projects/multi-fibv6/8/etc/rc.d/ntpdate ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/ntpdate Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/ntpdate Fri Feb 17 13:42:50 2012 (r231877) @@ -10,7 +10,7 @@ . /etc/rc.subr name="ntpdate" -rcvar=`set_rcvar` +rcvar="ntpdate_enable" stop_cmd=":" start_cmd="ntpdate_start" Modified: projects/multi-fibv6/8/etc/rc.d/pf ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/pf Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/pf Fri Feb 17 13:42:50 2012 (r231877) @@ -11,7 +11,7 @@ . /etc/rc.subr name="pf" -rcvar=`set_rcvar` +rcvar="pf_enable" load_rc_config $name start_cmd="pf_start" stop_cmd="pf_stop" Modified: projects/multi-fibv6/8/etc/rc.d/pflog ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/pflog Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/pflog Fri Feb 17 13:42:50 2012 (r231877) @@ -10,7 +10,7 @@ . /etc/rc.subr name="pflog" -rcvar=`set_rcvar` +rcvar="pflog_enable" command="/sbin/pflogd" pidfile="/var/run/pflogd.pid" start_precmd="pflog_prestart" Modified: projects/multi-fibv6/8/etc/rc.d/pfsync ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/pfsync Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/pfsync Fri Feb 17 13:42:50 2012 (r231877) @@ -10,7 +10,7 @@ . /etc/rc.subr name="pfsync" -rcvar=`set_rcvar` +rcvar="pfsync_enable" start_precmd="pfsync_prestart" start_cmd="pfsync_start" stop_cmd="pfsync_stop" Modified: projects/multi-fibv6/8/etc/rc.d/powerd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/powerd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/powerd Fri Feb 17 13:42:50 2012 (r231877) @@ -11,7 +11,7 @@ . /etc/rc.subr name="powerd" -rcvar=`set_rcvar` +rcvar="powerd_enable" command="/usr/sbin/${name}" stop_postcmd=powerd_poststop Modified: projects/multi-fibv6/8/etc/rc.d/ppp ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/ppp Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/ppp Fri Feb 17 13:42:50 2012 (r231877) @@ -10,7 +10,7 @@ . /etc/rc.subr name="ppp" -rcvar=`set_rcvar` +rcvar="ppp_enable" command="/usr/sbin/${name}" start_cmd="ppp_start" stop_cmd="ppp_stop" Modified: projects/multi-fibv6/8/etc/rc.d/pppoed ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/pppoed Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/pppoed Fri Feb 17 13:42:50 2012 (r231877) @@ -11,7 +11,7 @@ . /etc/rc.subr name="pppoed" -rcvar="`set_rcvar`" +rcvar="pppoed_enable" start_cmd="pppoed_start" # XXX stop_cmd will not be straightforward stop_cmd=":" Modified: projects/multi-fibv6/8/etc/rc.d/quota ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/quota Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/quota Fri Feb 17 13:42:50 2012 (r231877) @@ -13,7 +13,7 @@ . /etc/rc.subr name="quota" -rcvar=`set_rcvar` +rcvar="quota_enable" load_rc_config $name start_cmd="quota_start" stop_cmd="/usr/sbin/quotaoff ${quotaoff_flags}" Modified: projects/multi-fibv6/8/etc/rc.d/rarpd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/rarpd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/rarpd Fri Feb 17 13:42:50 2012 (r231877) @@ -11,7 +11,7 @@ . /etc/rc.subr name="rarpd" -rcvar=`set_rcvar` +rcvar="rarpd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/ethers" Modified: projects/multi-fibv6/8/etc/rc.d/rfcomm_pppd_server ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/rfcomm_pppd_server Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/rfcomm_pppd_server Fri Feb 17 13:42:50 2012 (r231877) @@ -11,7 +11,7 @@ . /etc/rc.subr name="rfcomm_pppd_server" -rcvar=`set_rcvar` +rcvar="rfcomm_pppd_server_enable" command="/usr/sbin/rfcomm_pppd" start_cmd="rfcomm_pppd_server_start" stop_cmd="rfcomm_pppd_server_stop" Modified: projects/multi-fibv6/8/etc/rc.d/route6d ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/route6d Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/route6d Fri Feb 17 13:42:50 2012 (r231877) @@ -10,6 +10,7 @@ . /etc/rc.subr name="route6d" +rcvar="ipv6_router_enable" # XXX - Executable may be in a different location. The $name variable # is different from the variable in rc.conf(5) so the @@ -18,7 +19,6 @@ name="route6d" # load_rc_config $name -rcvar="ipv6_router_enable" command="${ipv6_router:-/usr/sbin/${name}}" eval ${name}_flags=\"${ipv6_router_flags}\" Modified: projects/multi-fibv6/8/etc/rc.d/routed ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/routed Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/routed Fri Feb 17 13:42:50 2012 (r231877) @@ -10,13 +10,13 @@ . /etc/rc.subr name="routed" +rcvar="router_enable" # XXX - Executable may be in a different location. The $name variable # is different from the variable in rc.conf(5) so the # subroutines in rc.subr won't catch it. # load_rc_config $name -rcvar="router_enable" command="${router:-/sbin/${name}}" eval ${name}_flags=\"${router_flags}\" run_rc_command "$1" Modified: projects/multi-fibv6/8/etc/rc.d/routing ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/routing Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/routing Fri Feb 17 13:42:50 2012 (r231877) @@ -57,6 +57,26 @@ static_start() atmconfig natm add ${route_args} done fi + + # Disallow "internal" addresses to appear on the wire if inet6 + # is enabled. + if afexists inet6; then + local fibs i + + # Get the number of FIBs supported. + fibs=`sysctl -n net.fibs` + : ${fibs:=1} + + # disallow "internal" addresses to appear on the wire + i=0 + while test ${i} -lt ${fibs}; do + setfib -F ${i} route add -inet6 \ + ::ffff:0.0.0.0 -prefixlen 96 ::1 -reject + setfib -F ${i} route add -inet6 \ + ::0.0.0.0 -prefixlen 96 ::1 -reject + i=$((i + 1)) + done + fi } _ropts_initdone= Modified: projects/multi-fibv6/8/etc/rc.d/rpcbind ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/rpcbind Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/rpcbind Fri Feb 17 13:42:50 2012 (r231877) @@ -10,7 +10,7 @@ . /etc/rc.subr name="rpcbind" -rcvar=`set_rcvar` +rcvar="rpcbind_enable" command="/usr/sbin/${name}" stop_postcmd='/bin/rm -f /var/run/rpcbind.*' Modified: projects/multi-fibv6/8/etc/rc.d/rtadvd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/rtadvd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/rtadvd Fri Feb 17 13:42:50 2012 (r231877) @@ -11,7 +11,7 @@ . /etc/rc.subr name="rtadvd" -rcvar=`set_rcvar` +rcvar="rtadvd_enable" command="/usr/sbin/${name}" start_precmd="rtadvd_precmd" Modified: projects/multi-fibv6/8/etc/rc.d/rtsold ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/rtsold Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/rtsold Fri Feb 17 13:42:50 2012 (r231877) @@ -11,7 +11,7 @@ . /etc/rc.subr name="rtsold" -rcvar=`set_rcvar` +rcvar="rtsold_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" start_postcmd="rtsold_poststart" Modified: projects/multi-fibv6/8/etc/rc.d/rwho ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/rwho Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/rwho Fri Feb 17 13:42:50 2012 (r231877) @@ -11,7 +11,7 @@ . /etc/rc.subr name="rwhod" -rcvar="`set_rcvar`" +rcvar="rwhod_enable" command="/usr/sbin/${name}" load_rc_config $name Modified: projects/multi-fibv6/8/etc/rc.d/sdpd ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/sdpd Fri Feb 17 13:26:29 2012 (r231876) +++ projects/multi-fibv6/8/etc/rc.d/sdpd Fri Feb 17 13:42:50 2012 (r231877) @@ -12,7 +12,7 @@ name="sdpd" command="/usr/sbin/${name}" -rcvar=`set_rcvar` +rcvar="sdpd_enable" required_modules="ng_btsocket" load_rc_config $name Modified: projects/multi-fibv6/8/etc/rc.d/sendmail ============================================================================== --- projects/multi-fibv6/8/etc/rc.d/sendmail Fri Feb 17 13:26:29 2012 (r231876) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202171342.q1HDgpOd080590>