Date: Tue, 29 Jan 2008 05:18:22 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 134355 for review Message-ID: <200801290518.m0T5IMn1097376@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=134355 Change 134355 by jb@jb_freebsd1 on 2008/01/29 05:18:15 IF7 Affected files ... .. //depot/projects/dtrace7/src/etc/Makefile#2 integrate .. //depot/projects/dtrace7/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/dtrace7/src/etc/periodic/security/100.chksetuid#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/DAEMON#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/LOGIN#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/Makefile#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/NETWORKING#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/SERVERS#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/accounting#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/amd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/apmd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/bootconf.sh#2 delete .. //depot/projects/dtrace7/src/etc/rc.d/bootparams#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ccd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/cron#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/dhclient#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/dmesg#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/fsck#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ftp-proxy#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/inetd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ipfilter#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ipfs#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ipmon#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ipnat#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ipsec#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/isdnd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/jail#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/kerberos#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/keyserv#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ldconfig#3 integrate .. //depot/projects/dtrace7/src/etc/rc.d/local#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/lockd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/lpd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/motd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/mountcritlocal#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/mountd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/moused#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/mrouted#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/newsyslog#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/nfsd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/nfslocking#2 delete .. //depot/projects/dtrace7/src/etc/rc.d/power_profile#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/pwcheck#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/quota#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/rarpd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/resolv#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/root#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/route6d#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/routed#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/rpcbind#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/rtadvd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/rwho#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/savecore#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/securelevel#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/sendmail#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/sshd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/statd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/swap1#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/sysctl#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/syslogd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/timed#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/tmp#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ugidfw#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/var#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/virecover#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ypbind#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/yppasswdd#2 integrate .. //depot/projects/dtrace7/src/etc/rc.d/ypserv#2 integrate .. //depot/projects/dtrace7/src/lib/Makefile#5 integrate .. //depot/projects/dtrace7/src/sbin/ipfw/ipfw2.c#2 integrate .. //depot/projects/dtrace7/src/sbin/route/route.c#2 integrate .. //depot/projects/dtrace7/src/share/man/man5/src.conf.5#3 integrate .. //depot/projects/dtrace7/src/share/mk/bsd.own.mk#4 integrate .. //depot/projects/dtrace7/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/dtrace7/src/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/dtrace7/src/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/dtrace7/src/sys/netgraph/netflow/netflow.c#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/dtrace7/src/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/dtrace7/src/sys/sys/event.h#2 integrate .. //depot/projects/dtrace7/src/tools/build/options/WITHOUT_GSSAPI#1 branch .. //depot/projects/dtrace7/src/tools/build/options/makeman#2 integrate Differences ... ==== //depot/projects/dtrace7/src/etc/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.360.2.2 2007/11/11 02:16:00 mlaier Exp $ +# $FreeBSD: src/etc/Makefile,v 1.360.2.3 2008/01/29 00:18:07 dougb Exp $ .include <bsd.own.mk> @@ -78,12 +78,12 @@ afterinstall: .if ${MK_MAN} != "no" - cd ${.CURDIR}/../share/man; ${MAKE} makedb + ${_+_}cd ${.CURDIR}/../share/man; ${MAKE} makedb .endif distribute: - cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION} - cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} + ${_+_}cd ${.CURDIR} ; ${MAKE} install DESTDIR=${DISTDIR}/${DISTRIBUTION} + ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} .include <bsd.endian.mk> .if ${TARGET_ENDIANNESS} == "1234" @@ -112,15 +112,15 @@ master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \ pwd_mkdb ${PWD_MKDB_ENDIAN} -i -p -d ${DESTDIR}/etc \ ${DESTDIR}/etc/master.passwd - cd ${.CURDIR}/bluetooth; ${MAKE} install - cd ${.CURDIR}/defaults; ${MAKE} install - cd ${.CURDIR}/gss; ${MAKE} install - cd ${.CURDIR}/periodic; ${MAKE} install - cd ${.CURDIR}/rc.d; ${MAKE} install - cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall - cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap - cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt - cd ${.CURDIR}/pam.d; ${MAKE} install + ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install + ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install + ${_+_}cd ${.CURDIR}/gss; ${MAKE} install + ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install + ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install + ${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall + ${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap + ${_+_}cd ${.CURDIR}/../usr.sbin/rmt; ${MAKE} etc-rmt + ${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \ ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR} cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0600 \ @@ -128,7 +128,7 @@ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \ ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR} .if ${MK_I4B} != "no" - cd ${.CURDIR}/isdn; ${MAKE} install + ${_+_}cd ${.CURDIR}/isdn; ${MAKE} install .endif .if ${MK_BIND_MTREE} != "no" @if [ ! -e ${DESTDIR}/etc/namedb ]; then \ @@ -137,10 +137,10 @@ fi .endif .if ${MK_BIND_ETC} != "no" - cd ${.CURDIR}/namedb; ${MAKE} install + ${_+_}cd ${.CURDIR}/namedb; ${MAKE} install .endif .if ${MK_SENDMAIL} != "no" - cd ${.CURDIR}/sendmail; ${MAKE} distribution + ${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution .endif .if ${MK_OPENSSH} != "no" cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ @@ -239,7 +239,7 @@ cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \ ${BIN1} ${BIN2} nsmb.conf opieaccess \ ${DESTDIR}/usr/share/examples/etc - cd ${.CURDIR}/defaults; ${MAKE} install \ + ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \ DESTDIR=${DESTDIR}/usr/share/examples .include <bsd.prog.mk> ==== //depot/projects/dtrace7/src/etc/defaults/rc.conf#3 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.318.2.2 2008/01/19 17:18:16 maxim Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.318.2.3 2008/01/28 18:52:00 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -236,7 +236,7 @@ # kerberos5_server_enable="NO" # Run a kerberos 5 master server (or NO). kerberos5_server="/usr/libexec/kdc" # path to kerberos 5 KDC -kerberos5_server_flags="" # Additional flags to the kerberos 5 server +kerberos5_server_flags="--detach" # Additional flags to the kerberos 5 server kadmind5_server_enable="NO" # Run kadmind (or NO) kadmind5_server="/usr/libexec/kadmind" # path to kerberos 5 admin daemon kpasswdd_server_enable="NO" # Run kpasswdd (or NO) ==== //depot/projects/dtrace7/src/etc/periodic/security/100.chksetuid#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.8 2005/01/13 15:07:35 glebius Exp $ +# $FreeBSD: src/etc/periodic/security/100.chksetuid,v 1.8.10.1 2008/01/29 00:18:07 dougb Exp $ # # If there is a global system configuration file, suck it in. @@ -44,7 +44,7 @@ echo "" echo 'Checking setuid files and devices:' # XXX Note that there is the possibility of overrunning the args to ls - MP=`mount -t ufs | egrep -v " no(suid|exec)" | awk '{ print $3 }' | sort` + MP=`mount -t ufs,zfs | egrep -v " no(suid|exec)" | awk '{ print $3 }' | sort` if [ -n "${MP}" ] then set ${MP} ==== //depot/projects/dtrace7/src/etc/rc.d/DAEMON#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: DAEMON,v 1.8 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/DAEMON,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/DAEMON,v 1.5.10.1 2008/01/28 07:55:43 dougb Exp $ # # PROVIDE: DAEMON ==== //depot/projects/dtrace7/src/etc/rc.d/LOGIN#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: LOGIN,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/LOGIN,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/LOGIN,v 1.5.10.1 2008/01/28 07:55:43 dougb Exp $ # # PROVIDE: LOGIN ==== //depot/projects/dtrace7/src/etc/rc.d/Makefile#2 (text+ko) ==== @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.84 2007/09/28 10:38:08 bushman Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.84.2.2 2008/01/29 00:18:08 dougb Exp $ .include <bsd.own.mk> @@ -25,7 +24,7 @@ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 newsyslog nfsclient nfsd \ - nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ + nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ ==== //depot/projects/dtrace7/src/etc/rc.d/NETWORKING#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.13 2007/06/02 05:25:19 dougb Exp $ +# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.13.2.1 2008/01/28 07:55:43 dougb Exp $ # # PROVIDE: NETWORKING NETWORK ==== //depot/projects/dtrace7/src/etc/rc.d/SERVERS#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: SERVERS,v 1.9 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/SERVERS,v 1.7 2006/04/19 05:10:34 delphij Exp $ +# $FreeBSD: src/etc/rc.d/SERVERS,v 1.7.2.1 2008/01/28 07:55:43 dougb Exp $ # # PROVIDE: SERVERS ==== //depot/projects/dtrace7/src/etc/rc.d/accounting#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/accounting,v 1.10 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/accounting,v 1.10.2.1 2008/01/28 07:55:43 dougb Exp $ # # PROVIDE: accounting ==== //depot/projects/dtrace7/src/etc/rc.d/amd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $ -# $FreeBSD: src/etc/rc.d/amd,v 1.18.2.1 2007/10/28 20:07:29 mtm Exp $ +# $FreeBSD: src/etc/rc.d/amd,v 1.18.2.2 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: amd ==== //depot/projects/dtrace7/src/etc/rc.d/apmd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.12 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.12.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: apmd ==== //depot/projects/dtrace7/src/etc/rc.d/bootparams#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/bootparams,v 1.7 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/bootparams,v 1.7.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: bootparams ==== //depot/projects/dtrace7/src/etc/rc.d/ccd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ccd,v 1.3 2000/05/13 08:45:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ccd,v 1.5 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ccd,v 1.5.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: disks ==== //depot/projects/dtrace7/src/etc/rc.d/cron#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.7 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.7.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: cron ==== //depot/projects/dtrace7/src/etc/rc.d/dhclient#2 (text+ko) ==== @@ -1,12 +1,10 @@ #!/bin/sh # -# $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.28 2007/03/25 19:45:20 mtm Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.28.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: dhclient # KEYWORD: nojail nostart -# . /etc/rc.subr . /etc/network.subr ==== //depot/projects/dtrace7/src/etc/rc.d/dmesg#2 (text+ko) ==== @@ -1,13 +1,12 @@ #!/bin/sh # -# $NetBSD: dmesg,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dmesg,v 1.5 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/dmesg,v 1.5.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: dmesg # REQUIRE: mountcritremote cleanvar # BEFORE: DAEMON -# KEYWORD: Daemon nojail +# KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/dtrace7/src/etc/rc.d/fsck#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: fsck,v 1.2 2001/06/18 06:42:35 lukem Exp $ -# $FreeBSD: src/etc/rc.d/fsck,v 1.11 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/fsck,v 1.11.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: fsck ==== //depot/projects/dtrace7/src/etc/rc.d/ftp-proxy#2 (text+ko) ==== @@ -1,11 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.1 2007/09/06 21:00:48 mlaier Exp $ +# $FreeBSD: src/etc/rc.d/ftp-proxy,v 1.1.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: ftp-proxy # REQUIRE: DAEMON pf -# . /etc/rc.subr ==== //depot/projects/dtrace7/src/etc/rc.d/inetd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: inetd,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/inetd,v 1.5 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/inetd,v 1.5.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: inetd ==== //depot/projects/dtrace7/src/etc/rc.d/ipfilter#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.28 2007/04/09 08:53:40 des Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.28.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: ipfilter ==== //depot/projects/dtrace7/src/etc/rc.d/ipfs#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipfs,v 1.3 2002/02/11 13:55:42 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfs,v 1.6 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfs,v 1.6.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: ipfs ==== //depot/projects/dtrace7/src/etc/rc.d/ipmon#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipmon,v 1.9 2002/04/18 05:02:01 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipmon,v 1.15 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/ipmon,v 1.15.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: ipmon ==== //depot/projects/dtrace7/src/etc/rc.d/ipnat#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipnat,v 1.15 2006/12/31 10:37:18 yar Exp $ +# $FreeBSD: src/etc/rc.d/ipnat,v 1.15.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: ipnat ==== //depot/projects/dtrace7/src/etc/rc.d/ipsec#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ipsec,v 1.7 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ipsec,v 1.19 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipsec,v 1.19.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: ipsec ==== //depot/projects/dtrace7/src/etc/rc.d/isdnd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: isdnd,v 1.9 2002/04/10 23:37:13 martin Exp $ -# $FreeBSD: src/etc/rc.d/isdnd,v 1.23 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/isdnd,v 1.23.2.1 2008/01/28 07:55:44 dougb Exp $ # # Mostly based on original script (/etc/rc.isdn) written by Hellmuth Michaelis # ==== //depot/projects/dtrace7/src/etc/rc.d/jail#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.37 2007/05/24 06:01:06 rse Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.37.2.1 2008/01/29 00:18:08 dougb Exp $ # # PROVIDE: jail @@ -8,6 +8,12 @@ # BEFORE: securelevel # KEYWORD: nojail shutdown +# WARNING: This script deals with untrusted data (the data and +# processes inside the jails) and care must be taken when changing the +# code related to this! If you have any doubt whether a change is +# correct and have security impact, please get the patch reviewed by +# the FreeBSD Security Team prior to commit. + . /etc/rc.subr name="jail" ==== //depot/projects/dtrace7/src/etc/rc.d/kerberos#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/kerberos,v 1.6 2007/05/17 11:33:08 mtm Exp $ +# $FreeBSD: src/etc/rc.d/kerberos,v 1.6.2.2 2008/01/28 23:36:54 mtm Exp $ # # PROVIDE: kerberos @@ -10,8 +10,8 @@ name="kerberos5" rcvar="kerberos5_server_enable" -command_args="--detach" load_rc_config $name command="${kerberos5_server}" +kerberos5_flags="${kerberos5_server_flags}" run_rc_command "$1" ==== //depot/projects/dtrace7/src/etc/rc.d/keyserv#2 (text+ko) ==== @@ -1,10 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/keyserv,v 1.3 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/keyserv,v 1.3.10.1 2008/01/28 07:55:44 dougb Exp $ # # Start keyserv if we are running Secure RPC -# # PROVIDE: keyserv # REQUIRE: ypbind ==== //depot/projects/dtrace7/src/etc/rc.d/ldconfig#3 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.17.2.1 2007/12/18 01:34:09 jhb Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.17.2.2 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: ldconfig ==== //depot/projects/dtrace7/src/etc/rc.d/local#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: local,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/local,v 1.6 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/local,v 1.6.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: local ==== //depot/projects/dtrace7/src/etc/rc.d/lockd#2 (text+ko) ==== @@ -1,8 +1,7 @@ #!/bin/sh # -# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $ # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm -# $FreeBSD: src/etc/rc.d/lockd,v 1.18 2007/09/03 02:02:31 mtm Exp $ +# $FreeBSD: src/etc/rc.d/lockd,v 1.18.4.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: lockd ==== //depot/projects/dtrace7/src/etc/rc.d/lpd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: lpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/lpd,v 1.8 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/lpd,v 1.8.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: lpd ==== //depot/projects/dtrace7/src/etc/rc.d/motd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: motd,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/motd,v 1.9 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/motd,v 1.9.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: motd ==== //depot/projects/dtrace7/src/etc/rc.d/mountcritlocal#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountcritlocal,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.14 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.14.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: mountcritlocal ==== //depot/projects/dtrace7/src/etc/rc.d/mountcritremote#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountcritremote,v 1.7 2002/04/29 12:29:53 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.16 2007/04/09 08:53:40 des Exp $ +# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.16.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: mountcritremote ==== //depot/projects/dtrace7/src/etc/rc.d/mountd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mountd,v 1.11 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/mountd,v 1.19 2007/04/13 10:29:25 pjd Exp $ +# $FreeBSD: src/etc/rc.d/mountd,v 1.19.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: mountd ==== //depot/projects/dtrace7/src/etc/rc.d/moused#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: moused,v 1.1 2001/10/29 23:25:01 augustss Exp $ -# $FreeBSD: src/etc/rc.d/moused,v 1.11 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/moused,v 1.11.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: moused ==== //depot/projects/dtrace7/src/etc/rc.d/mrouted#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: mrouted,v 1.6 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/mrouted,v 1.10 2006/09/29 15:45:10 bms Exp $ +# $FreeBSD: src/etc/rc.d/mrouted,v 1.10.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: mrouted ==== //depot/projects/dtrace7/src/etc/rc.d/newsyslog#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: newsyslog,v 1.5 2002/03/24 15:51:26 lukem Exp $ -# $FreeBSD: src/etc/rc.d/newsyslog,v 1.5 2005/12/21 09:54:15 dougb Exp $ +# $FreeBSD: src/etc/rc.d/newsyslog,v 1.5.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: newsyslog ==== //depot/projects/dtrace7/src/etc/rc.d/nfsd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: nfsd,v 1.4 2001/06/16 06:13:10 lukem Exp $ -# $FreeBSD: src/etc/rc.d/nfsd,v 1.13 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/nfsd,v 1.13.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: nfsd ==== //depot/projects/dtrace7/src/etc/rc.d/power_profile#2 (text+ko) ==== @@ -5,7 +5,7 @@ # # Arguments: 0x00 (AC offline, economy) or 0x01 (AC online, performance) # -# $FreeBSD: src/etc/rc.d/power_profile,v 1.11 2007/04/02 22:53:07 des Exp $ +# $FreeBSD: src/etc/rc.d/power_profile,v 1.11.2.1 2008/01/29 00:18:08 dougb Exp $ # # PROVIDE: power_profile @@ -15,6 +15,7 @@ . /etc/rc.subr name="power_profile" +stop_cmd=':' LOGGER="logger -t power_profile -p daemon.notice" # Set a given sysctl node to a value. ==== //depot/projects/dtrace7/src/etc/rc.d/pwcheck#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: pwcheck,v 1.4 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/pwcheck,v 1.4 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/pwcheck,v 1.4.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: pwcheck ==== //depot/projects/dtrace7/src/etc/rc.d/quota#2 (text+ko) ==== @@ -1,10 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/quota,v 1.6 2007/01/20 04:24:20 mpp Exp $ +# $FreeBSD: src/etc/rc.d/quota,v 1.6.2.1 2008/01/28 07:55:44 dougb Exp $ # # Enable/Check the quotas (must be after ypbind if using NIS) -# # PROVIDE: quota # REQUIRE: mountcritremote ==== //depot/projects/dtrace7/src/etc/rc.d/rarpd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rarpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/rarpd,v 1.6 2005/01/16 03:12:03 obrien Exp $ +# $FreeBSD: src/etc/rc.d/rarpd,v 1.6.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: rarpd ==== //depot/projects/dtrace7/src/etc/rc.d/resolv#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/resolv,v 1.37 2007/06/02 05:24:39 dougb Exp $ +# $FreeBSD: src/etc/rc.d/resolv,v 1.37.2.1 2008/01/29 00:18:08 dougb Exp $ # # PROVIDE: resolv @@ -34,6 +34,7 @@ . /etc/rc.subr name="resolv" +stop_cmd=':' load_rc_config $name ==== //depot/projects/dtrace7/src/etc/rc.d/root#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: root,v 1.2 2000/05/13 08:45:09 lukem Exp $ -# $FreeBSD: src/etc/rc.d/root,v 1.15 2007/05/18 12:04:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.15.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: root ==== //depot/projects/dtrace7/src/etc/rc.d/route6d#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: route6d,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/route6d,v 1.9 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/route6d,v 1.9.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: route6d ==== //depot/projects/dtrace7/src/etc/rc.d/routed#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: routed,v 1.7 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/routed,v 1.12 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/routed,v 1.12.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: routed ==== //depot/projects/dtrace7/src/etc/rc.d/rpcbind#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rpcbind,v 1.6 2002/01/31 01:26:06 lukem Exp $ -# $FreeBSD: src/etc/rc.d/rpcbind,v 1.12 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/rpcbind,v 1.12.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: rpcbind ==== //depot/projects/dtrace7/src/etc/rc.d/rtadvd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rtadvd,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/rtadvd,v 1.10 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/rtadvd,v 1.10.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: rtadvd ==== //depot/projects/dtrace7/src/etc/rc.d/rwho#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: rwho,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/rwho,v 1.4 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/rwho,v 1.4.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: rwho ==== //depot/projects/dtrace7/src/etc/rc.d/savecore#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: savecore,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/savecore,v 1.10 2004/10/24 13:04:09 des Exp $ +# $FreeBSD: src/etc/rc.d/savecore,v 1.10.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: savecore ==== //depot/projects/dtrace7/src/etc/rc.d/securelevel#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/securelevel,v 1.10 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/securelevel,v 1.10.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: securelevel ==== //depot/projects/dtrace7/src/etc/rc.d/sendmail#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: sendmail,v 1.14 2002/02/12 01:26:36 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sendmail,v 1.17 2007/06/12 17:33:23 gshapiro Exp $ +# $FreeBSD: src/etc/rc.d/sendmail,v 1.17.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: mail @@ -11,7 +10,7 @@ # XXX - Get together with sendmail mantainer to figure out how to # better handle SENDMAIL_ENABLE and 3rd party MTAs. -# + . /etc/rc.subr name="sendmail" ==== //depot/projects/dtrace7/src/etc/rc.d/sshd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: sshd,v 1.18 2002/04/29 08:23:34 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sshd,v 1.12 2006/08/22 11:17:28 flz Exp $ +# $FreeBSD: src/etc/rc.d/sshd,v 1.12.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: sshd ==== //depot/projects/dtrace7/src/etc/rc.d/statd#2 (text+ko) ==== @@ -1,8 +1,7 @@ #!/bin/sh # -# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $ # FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm Exp -# $FreeBSD: src/etc/rc.d/statd,v 1.17 2007/08/18 04:08:53 mtm Exp $ +# $FreeBSD: src/etc/rc.d/statd,v 1.17.4.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: statd ==== //depot/projects/dtrace7/src/etc/rc.d/swap1#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: swap1,v 1.8 2002/03/24 15:52:41 lukem Exp $ -# $FreeBSD: src/etc/rc.d/swap1,v 1.9 2004/11/05 12:38:27 pjd Exp $ +# $FreeBSD: src/etc/rc.d/swap1,v 1.9.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: localswap ==== //depot/projects/dtrace7/src/etc/rc.d/sysctl#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: sysctl,v 1.12 2002/04/29 12:10:23 lukem Exp $ -# $FreeBSD: src/etc/rc.d/sysctl,v 1.17 2006/05/24 11:36:48 glebius Exp $ +# $FreeBSD: src/etc/rc.d/sysctl,v 1.17.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: sysctl ==== //depot/projects/dtrace7/src/etc/rc.d/syslogd#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: syslogd,v 1.12 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/syslogd,v 1.12 2006/12/30 22:53:20 yar Exp $ +# $FreeBSD: src/etc/rc.d/syslogd,v 1.12.2.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: syslogd ==== //depot/projects/dtrace7/src/etc/rc.d/timed#2 (text+ko) ==== @@ -1,7 +1,6 @@ #!/bin/sh # -# $NetBSD: timed,v 1.5 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/timed,v 1.5 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/timed,v 1.5.10.1 2008/01/28 07:55:44 dougb Exp $ # # PROVIDE: timed ==== //depot/projects/dtrace7/src/etc/rc.d/tmp#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/tmp,v 1.38 2007/05/24 05:54:37 rse Exp $ +# $FreeBSD: src/etc/rc.d/tmp,v 1.38.2.1 2008/01/29 00:18:08 dougb Exp $ # # PROVIDE: tmp @@ -33,6 +33,7 @@ . /etc/rc.subr name="tmp" +stop_cmd=':' load_rc_config $name ==== //depot/projects/dtrace7/src/etc/rc.d/ugidfw#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801290518.m0T5IMn1097376>