PERFORCE change 62957 for review
Peter Wemm
peter at FreeBSD.org
Sun Oct 10 11:58:20 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=62957
Change 62957 by peter at peter_daintree on 2004/10/10 18:57:19
IFC @62954
Affected files ...
.. //depot/projects/hammer/UPDATING#61 integrate
.. //depot/projects/hammer/contrib/pf/man/pf.conf.5#5 integrate
.. //depot/projects/hammer/etc/Makefile#32 integrate
.. //depot/projects/hammer/etc/rc#15 integrate
.. //depot/projects/hammer/etc/rc.d/DAEMON#4 integrate
.. //depot/projects/hammer/etc/rc.d/LOGIN#4 integrate
.. //depot/projects/hammer/etc/rc.d/NETWORKING#8 integrate
.. //depot/projects/hammer/etc/rc.d/SERVERS#4 integrate
.. //depot/projects/hammer/etc/rc.d/abi#4 integrate
.. //depot/projects/hammer/etc/rc.d/accounting#7 integrate
.. //depot/projects/hammer/etc/rc.d/addswap#4 integrate
.. //depot/projects/hammer/etc/rc.d/adjkerntz#5 integrate
.. //depot/projects/hammer/etc/rc.d/amd#8 integrate
.. //depot/projects/hammer/etc/rc.d/apm#6 integrate
.. //depot/projects/hammer/etc/rc.d/apmd#9 integrate
.. //depot/projects/hammer/etc/rc.d/archdep#7 integrate
.. //depot/projects/hammer/etc/rc.d/atm1#6 integrate
.. //depot/projects/hammer/etc/rc.d/atm2#3 integrate
.. //depot/projects/hammer/etc/rc.d/atm3#4 integrate
.. //depot/projects/hammer/etc/rc.d/bgfsck#5 integrate
.. //depot/projects/hammer/etc/rc.d/bootparams#5 integrate
.. //depot/projects/hammer/etc/rc.d/ccd#4 integrate
.. //depot/projects/hammer/etc/rc.d/cleanvar#7 integrate
.. //depot/projects/hammer/etc/rc.d/cleartmp#9 integrate
.. //depot/projects/hammer/etc/rc.d/cron#5 integrate
.. //depot/projects/hammer/etc/rc.d/devd#4 integrate
.. //depot/projects/hammer/etc/rc.d/devfs#9 integrate
.. //depot/projects/hammer/etc/rc.d/dhclient#12 integrate
.. //depot/projects/hammer/etc/rc.d/dmesg#3 integrate
.. //depot/projects/hammer/etc/rc.d/dumpon#5 integrate
.. //depot/projects/hammer/etc/rc.d/early.sh#2 integrate
.. //depot/projects/hammer/etc/rc.d/fsck#6 integrate
.. //depot/projects/hammer/etc/rc.d/gbde#6 integrate
.. //depot/projects/hammer/etc/rc.d/gbde_swap#4 integrate
.. //depot/projects/hammer/etc/rc.d/hostname#7 integrate
.. //depot/projects/hammer/etc/rc.d/ike#4 integrate
.. //depot/projects/hammer/etc/rc.d/inetd#3 integrate
.. //depot/projects/hammer/etc/rc.d/initdiskless#13 integrate
.. //depot/projects/hammer/etc/rc.d/initrandom#4 integrate
.. //depot/projects/hammer/etc/rc.d/ip6addrctl#4 integrate
.. //depot/projects/hammer/etc/rc.d/ip6fw#6 integrate
.. //depot/projects/hammer/etc/rc.d/ipfilter#18 integrate
.. //depot/projects/hammer/etc/rc.d/ipfs#5 integrate
.. //depot/projects/hammer/etc/rc.d/ipfw#9 integrate
.. //depot/projects/hammer/etc/rc.d/ipmon#10 integrate
.. //depot/projects/hammer/etc/rc.d/ipnat#11 integrate
.. //depot/projects/hammer/etc/rc.d/ipsec#8 integrate
.. //depot/projects/hammer/etc/rc.d/ipxrouted#3 integrate
.. //depot/projects/hammer/etc/rc.d/isdnd#9 integrate
.. //depot/projects/hammer/etc/rc.d/jail#10 integrate
.. //depot/projects/hammer/etc/rc.d/kadmind#3 integrate
.. //depot/projects/hammer/etc/rc.d/kerberos#3 integrate
.. //depot/projects/hammer/etc/rc.d/keyserv#3 integrate
.. //depot/projects/hammer/etc/rc.d/kldxref#4 integrate
.. //depot/projects/hammer/etc/rc.d/kpasswdd#3 integrate
.. //depot/projects/hammer/etc/rc.d/ldconfig#10 integrate
.. //depot/projects/hammer/etc/rc.d/local#5 integrate
.. //depot/projects/hammer/etc/rc.d/localpkg#3 integrate
.. //depot/projects/hammer/etc/rc.d/lomac#4 integrate
.. //depot/projects/hammer/etc/rc.d/lpd#4 integrate
.. //depot/projects/hammer/etc/rc.d/mixer#4 integrate
.. //depot/projects/hammer/etc/rc.d/motd#7 integrate
.. //depot/projects/hammer/etc/rc.d/mountcritlocal#9 integrate
.. //depot/projects/hammer/etc/rc.d/mountcritremote#8 integrate
.. //depot/projects/hammer/etc/rc.d/mountd#7 integrate
.. //depot/projects/hammer/etc/rc.d/moused#6 integrate
.. //depot/projects/hammer/etc/rc.d/mroute6d#4 integrate
.. //depot/projects/hammer/etc/rc.d/mrouted#7 integrate
.. //depot/projects/hammer/etc/rc.d/msgs#2 integrate
.. //depot/projects/hammer/etc/rc.d/named#9 integrate
.. //depot/projects/hammer/etc/rc.d/natd#2 integrate
.. //depot/projects/hammer/etc/rc.d/netif#9 integrate
.. //depot/projects/hammer/etc/rc.d/netoptions#5 integrate
.. //depot/projects/hammer/etc/rc.d/network_ipv6#7 integrate
.. //depot/projects/hammer/etc/rc.d/nfsclient#5 integrate
.. //depot/projects/hammer/etc/rc.d/nfsd#7 integrate
.. //depot/projects/hammer/etc/rc.d/nfslocking#7 integrate
.. //depot/projects/hammer/etc/rc.d/nfsserver#4 integrate
.. //depot/projects/hammer/etc/rc.d/nisdomain#3 integrate
.. //depot/projects/hammer/etc/rc.d/nsswitch#4 integrate
.. //depot/projects/hammer/etc/rc.d/ntpd#7 integrate
.. //depot/projects/hammer/etc/rc.d/ntpdate#10 integrate
.. //depot/projects/hammer/etc/rc.d/othermta#2 integrate
.. //depot/projects/hammer/etc/rc.d/pccard#5 integrate
.. //depot/projects/hammer/etc/rc.d/pcvt#4 integrate
.. //depot/projects/hammer/etc/rc.d/pf#5 integrate
.. //depot/projects/hammer/etc/rc.d/pflog#4 integrate
.. //depot/projects/hammer/etc/rc.d/power_profile#4 integrate
.. //depot/projects/hammer/etc/rc.d/ppp-user#6 integrate
.. //depot/projects/hammer/etc/rc.d/pppoed#3 integrate
.. //depot/projects/hammer/etc/rc.d/preseedrandom#4 integrate
.. //depot/projects/hammer/etc/rc.d/pwcheck#3 integrate
.. //depot/projects/hammer/etc/rc.d/quota#4 integrate
.. //depot/projects/hammer/etc/rc.d/ramdisk#3 integrate
.. //depot/projects/hammer/etc/rc.d/ramdisk-own#2 integrate
.. //depot/projects/hammer/etc/rc.d/random#7 integrate
.. //depot/projects/hammer/etc/rc.d/rarpd#4 integrate
.. //depot/projects/hammer/etc/rc.d/rcconf.sh#2 integrate
.. //depot/projects/hammer/etc/rc.d/resolv#3 integrate
.. //depot/projects/hammer/etc/rc.d/root#8 integrate
.. //depot/projects/hammer/etc/rc.d/route6d#6 integrate
.. //depot/projects/hammer/etc/rc.d/routed#10 integrate
.. //depot/projects/hammer/etc/rc.d/routing#5 integrate
.. //depot/projects/hammer/etc/rc.d/rpcbind#7 integrate
.. //depot/projects/hammer/etc/rc.d/rtadvd#7 integrate
.. //depot/projects/hammer/etc/rc.d/rwho#3 integrate
.. //depot/projects/hammer/etc/rc.d/savecore#6 integrate
.. //depot/projects/hammer/etc/rc.d/securelevel#6 integrate
.. //depot/projects/hammer/etc/rc.d/sendmail#9 integrate
.. //depot/projects/hammer/etc/rc.d/serial#5 integrate
.. //depot/projects/hammer/etc/rc.d/sppp#4 integrate
.. //depot/projects/hammer/etc/rc.d/sshd#5 integrate
.. //depot/projects/hammer/etc/rc.d/swap1#6 integrate
.. //depot/projects/hammer/etc/rc.d/syscons#6 integrate
.. //depot/projects/hammer/etc/rc.d/sysctl#6 integrate
.. //depot/projects/hammer/etc/rc.d/syslogd#6 integrate
.. //depot/projects/hammer/etc/rc.d/timed#4 integrate
.. //depot/projects/hammer/etc/rc.d/tmp#3 integrate
.. //depot/projects/hammer/etc/rc.d/usbd#3 integrate
.. //depot/projects/hammer/etc/rc.d/var#3 integrate
.. //depot/projects/hammer/etc/rc.d/vinum#3 integrate
.. //depot/projects/hammer/etc/rc.d/virecover#7 integrate
.. //depot/projects/hammer/etc/rc.d/watchdogd#4 integrate
.. //depot/projects/hammer/etc/rc.d/ypbind#7 integrate
.. //depot/projects/hammer/etc/rc.d/yppasswdd#6 integrate
.. //depot/projects/hammer/etc/rc.d/ypserv#7 integrate
.. //depot/projects/hammer/etc/rc.d/ypset#6 integrate
.. //depot/projects/hammer/etc/rc.d/ypupdated#5 integrate
.. //depot/projects/hammer/etc/rc.d/ypxfrd#6 integrate
.. //depot/projects/hammer/etc/rc.shutdown#6 integrate
.. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#5 integrate
.. //depot/projects/hammer/lib/libc/gen/syslog.c#5 integrate
.. //depot/projects/hammer/lib/libc/net/addr2ascii.3#6 integrate
.. //depot/projects/hammer/lib/libc/sys/kse.2#6 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_execve.c#2 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#33 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_exit.c#12 integrate
.. //depot/projects/hammer/lib/msun/src/s_ilogb.c#3 integrate
.. //depot/projects/hammer/lib/msun/src/s_ilogbf.c#2 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#81 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/dir.c#7 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/fsck.h#8 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/fsutil.c#9 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/inode.c#5 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/main.c#8 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/pass1.c#10 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/pass1b.c#5 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/pass2.c#7 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/pass3.c#5 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/pass4.c#5 integrate
.. //depot/projects/hammer/sbin/fsck_ffs/pass5.c#9 integrate
.. //depot/projects/hammer/sbin/fsdb/Makefile#6 integrate
.. //depot/projects/hammer/sbin/fsdb/fsdb.c#4 integrate
.. //depot/projects/hammer/sbin/growfs/growfs.c#11 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#30 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#33 integrate
.. //depot/projects/hammer/share/examples/etc/make.conf#25 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#51 integrate
.. //depot/projects/hammer/share/man/man4/altq.4#1 branch
.. //depot/projects/hammer/share/man/man4/ieee80211.4#5 integrate
.. //depot/projects/hammer/share/man/man4/mac_bsdextended.4#8 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#25 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/pbio.4#1 branch
.. //depot/projects/hammer/share/man/man4/man4.sparc64/Makefile#1 branch
.. //depot/projects/hammer/share/man/man4/man4.sparc64/auxio.4#1 branch
.. //depot/projects/hammer/share/man/man4/vinum.4#4 integrate
.. //depot/projects/hammer/share/man/man5/make.conf.5#25 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#36 integrate
.. //depot/projects/hammer/share/man/man8/rc.8#6 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#41 integrate
.. //depot/projects/hammer/share/man/man9/altq.9#4 integrate
.. //depot/projects/hammer/share/man/man9/mbuf_tags.9#2 integrate
.. //depot/projects/hammer/share/man/man9/pfil.9#8 integrate
.. //depot/projects/hammer/share/man/man9/rtalloc.9#5 integrate
.. //depot/projects/hammer/share/man/man9/rtentry.9#6 integrate
.. //depot/projects/hammer/share/mk/bsd.cpu.mk#22 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#116 integrate
.. //depot/projects/hammer/sys/amd64/include/pmap.h#49 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_util.h#5 integrate
.. //depot/projects/hammer/sys/conf/files#86 integrate
.. //depot/projects/hammer/sys/conf/files.i386#41 integrate
.. //depot/projects/hammer/sys/conf/files.sparc64#22 integrate
.. //depot/projects/hammer/sys/conf/kern.pre.mk#32 integrate
.. //depot/projects/hammer/sys/conf/kmod.mk#34 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_quirks#3 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_timer.c#11 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpivar.h#36 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#39 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.h#23 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-cbus.c#9 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#47 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-disk.c#25 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#25 integrate
.. //depot/projects/hammer/sys/dev/auxio/auxio.c#1 branch
.. //depot/projects/hammer/sys/dev/auxio/auxioreg.h#1 branch
.. //depot/projects/hammer/sys/dev/bfe/if_bfe.c#11 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.c#30 integrate
.. //depot/projects/hammer/sys/dev/fe/if_fe.c#15 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#20 integrate
.. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#5 integrate
.. //depot/projects/hammer/sys/dev/rc/rc.c#14 integrate
.. //depot/projects/hammer/sys/dev/sx/sx.c#10 integrate
.. //depot/projects/hammer/sys/dev/sx/sx.h#4 integrate
.. //depot/projects/hammer/sys/dev/usb/uhid.c#16 integrate
.. //depot/projects/hammer/sys/geom/geom_pc98.c#21 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#11 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#55 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#59 integrate
.. //depot/projects/hammer/sys/i386/include/pmap.h#19 integrate
.. //depot/projects/hammer/sys/i386/isa/pbio.c#1 branch
.. //depot/projects/hammer/sys/kern/init_sysent.c#34 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#35 integrate
.. //depot/projects/hammer/sys/kern/kern_kse.c#15 integrate
.. //depot/projects/hammer/sys/kern/kern_proc.c#38 integrate
.. //depot/projects/hammer/sys/kern/kern_switch.c#32 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#34 integrate
.. //depot/projects/hammer/sys/kern/syscalls.c#33 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#33 integrate
.. //depot/projects/hammer/sys/kern/uipc_mbuf2.c#12 integrate
.. //depot/projects/hammer/sys/modules/Makefile#56 integrate
.. //depot/projects/hammer/sys/modules/auxio/Makefile#1 branch
.. //depot/projects/hammer/sys/net/net_osdep.c#4 delete
.. //depot/projects/hammer/sys/net/net_osdep.h#6 integrate
.. //depot/projects/hammer/sys/net/pfil.c#6 integrate
.. //depot/projects/hammer/sys/netgraph/ng_ether.c#14 integrate
.. //depot/projects/hammer/sys/netinet/ip_mroute.c#24 integrate
.. //depot/projects/hammer/sys/netinet/tcp_output.c#23 integrate
.. //depot/projects/hammer/sys/pci/if_sis.c#30 integrate
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#30 integrate
.. //depot/projects/hammer/sys/sparc64/conf/NOTES#9 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/machdep.c#33 integrate
.. //depot/projects/hammer/sys/sys/kse.h#18 integrate
.. //depot/projects/hammer/sys/sys/mbuf.h#32 integrate
.. //depot/projects/hammer/sys/sys/pbioio.h#1 branch
.. //depot/projects/hammer/sys/sys/socketvar.h#22 integrate
.. //depot/projects/hammer/sys/sys/syscall.h#33 integrate
.. //depot/projects/hammer/sys/sys/syscall.mk#33 integrate
.. //depot/projects/hammer/sys/sys/syscallsubr.h#11 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#33 integrate
.. //depot/projects/hammer/sys/ufs/ffs/fs.h#9 integrate
.. //depot/projects/hammer/sys/vm/uma_core.c#31 integrate
.. //depot/projects/hammer/sys/vm/uma_dbg.c#9 integrate
.. //depot/projects/hammer/tools/regression/netinet/tcpconnect/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/netinet/tcpconnect/tcpconnect.c#1 branch
.. //depot/projects/hammer/tools/tools/netrate/netblast/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/netrate/netblast/netblast.c#1 branch
.. //depot/projects/hammer/tools/tools/netrate/netsend/netsend.c#5 integrate
.. //depot/projects/hammer/tools/tools/recoverdisk/recoverdisk.c#2 integrate
.. //depot/projects/hammer/usr.sbin/gstat/gstat.8#5 integrate
.. //depot/projects/hammer/usr.sbin/gstat/gstat.c#7 integrate
.. //depot/projects/hammer/usr.sbin/rpc.lockd/lock_proc.c#6 integrate
Differences ...
==== //depot/projects/hammer/UPDATING#61 (text+ko) ====
@@ -23,6 +23,20 @@
developers choose to disable these features on build machines
to maximize performance.
+20041007:
+ The FreeBSD keyword is no longer a requirement for a valid
+ rc.d script. The rc(8) and rc.shutdown(8) scripts no longer check
+ for the existence of this keyword when ordering rc.d scripts.
+ This change touches most of the file in /etc/rc.d; therefore,
+ if you have not modified any files in that directory it may
+ be easier to rm -rf /etc/rc.d and then use the -i switch with
+ mergemaster(8).
+
+20041007:
+ One of the syscalls the 1:1 threading library libthr uses has
+ changed, thus breaking ABI compatibility. Make sure you rebuild
+ this library with the kernel.
+
20041001:
The following libraries had their version number bumped up:
/lib/libm.so.2 -> libm.so.3
@@ -1939,4 +1953,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.369 2004/10/04 20:11:34 dougb Exp $
+$FreeBSD: src/UPDATING,v 1.373 2004/10/10 16:12:09 mtm Exp $
==== //depot/projects/hammer/contrib/pf/man/pf.conf.5#5 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.3 2004/10/03 10:42:42 mlaier Exp $
+.\" $FreeBSD: src/contrib/pf/man/pf.conf.5,v 1.4 2004/10/07 15:39:02 mlaier Exp $
.\" $OpenBSD: pf.conf.5,v 1.292 2004/02/24 05:44:48 mcbride Exp $
.\"
.\" Copyright (c) 2002, Daniel Hartmeier
@@ -626,7 +626,7 @@
.Bd -literal -offset indent
scrub in on $ext_if all fragment reassemble
.Ed
-.Sh QUEUEING
+.Sh QUEUEING/ALTQ
Packets can be assigned to queues for the purpose of bandwidth
control.
At least two declarations are required to configure queues, and later
@@ -1473,7 +1473,7 @@
.Em lowdelay
and TCP ACKs with no data payload will be assigned to the second one.
See
-.Sx QUEUEING
+.Sx QUEUEING/ALTQ
for setup details.
.Pp
For example:
==== //depot/projects/hammer/etc/Makefile#32 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.334 2004/10/05 13:03:08 ru Exp $
+# $FreeBSD: src/etc/Makefile,v 1.335 2004/10/08 00:14:27 dougb Exp $
.if !defined(NO_SENDMAIL)
SUBDIR= sendmail
@@ -122,7 +122,8 @@
ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${MTREE} ${DESTDIR}/etc/mtree
-.if !defined(NO_BIND_ETC) && !defined(NO_BIND)
+.if !defined(NO_BIND)
+.if !defined(NO_BIND_ETC)
.if defined(NO_BIND_CHROOT)
cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${NAMEDB} ${DESTDIR}/etc/namedb
@@ -130,6 +131,13 @@
cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${NAMEDB} ${DESTDIR}/var/named/etc/namedb
.endif
+.if !defined(NO_BIND_MTREE)
+ @if [ ! -e ${DESTDIR}/etc/namedb ]; then \
+ set -x; \
+ ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
+ fi
+.endif
+.endif
.endif
cd ${.CURDIR}/ppp; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
${PPPCNF} ${DESTDIR}/etc/ppp
@@ -189,6 +197,7 @@
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.include.dist \
-p ${DESTDIR}/usr/include
.endif
+.if !defined(NO_BIND_MTREE)
.if defined(NO_BIND_CHROOT)
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.etc.dist \
-p ${DESTDIR}/etc
@@ -197,7 +206,8 @@
.else
mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \
-p ${DESTDIR}/var/named
- ln -fhs /var/named/etc/namedb ${DESTDIR}/etc/namedb
+.endif
+.endif
.endif
.endif
.if !defined(NO_SENDMAIL)
==== //depot/projects/hammer/etc/rc#15 (text+ko) ====
@@ -25,7 +25,7 @@
# SUCH DAMAGE.
#
# @(#)rc 5.27 (Berkeley) 6/5/91
-# $FreeBSD: src/etc/rc,v 1.333 2004/07/24 16:30:31 mtm Exp $
+# $FreeBSD: src/etc/rc,v 1.335 2004/10/08 14:23:49 mtm Exp $
#
# System startup script run by init on autoboot
@@ -65,10 +65,9 @@
_boot="start"
fi
-os=`eval ${CMD_OSTYPE}`
skip="-s nostart"
[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip -s nojail"
-files=`rcorder -k ${os} ${skip} /etc/rc.d/* 2>/dev/null`
+files=`rcorder ${skip} /etc/rc.d/* 2>/dev/null`
for _rc_elem in ${files}; do
run_rc_script ${_rc_elem} ${_boot}
==== //depot/projects/hammer/etc/rc.d/DAEMON#4 (text+ko) ====
@@ -1,12 +1,11 @@
#!/bin/sh
#
# $NetBSD: DAEMON,v 1.8 2002/03/22 04:33:57 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/DAEMON,v 1.4 2004/01/17 10:16:38 mtm Exp $
+# $FreeBSD: src/etc/rc.d/DAEMON,v 1.5 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: DAEMON
# REQUIRE: NETWORKING SERVERS
-# KEYWORD: FreeBSD
# This is a dummy dependency, to ensure that general purpose daemons
# are run _after_ the above are.
==== //depot/projects/hammer/etc/rc.d/LOGIN#4 (text+ko) ====
@@ -1,12 +1,11 @@
#!/bin/sh
#
# $NetBSD: LOGIN,v 1.7 2002/03/22 04:33:57 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/LOGIN,v 1.4 2004/01/17 10:16:38 mtm Exp $
+# $FreeBSD: src/etc/rc.d/LOGIN,v 1.5 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: LOGIN
# REQUIRE: DAEMON
-# KEYWORD: FreeBSD
# This is a dummy dependency to ensure user services such as xdm,
# inetd, cron and kerberos are started after everything else, in case
==== //depot/projects/hammer/etc/rc.d/NETWORKING#8 (text+ko) ====
@@ -1,13 +1,12 @@
#!/bin/sh
#
# $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.8 2004/03/05 07:43:37 mtm Exp $
+# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.9 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: NETWORKING NETWORK
# REQUIRE: dhclient netif routing network_ipv6 isdnd ppp-user
# REQUIRE: routed mrouted route6d mroute6d
-# KEYWORD: FreeBSD
# This is a dummy dependency, for services which require networking
# to be operational before starting.
==== //depot/projects/hammer/etc/rc.d/SERVERS#4 (text+ko) ====
@@ -1,12 +1,11 @@
#!/bin/sh
#
# $NetBSD: SERVERS,v 1.9 2002/03/22 04:33:57 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/SERVERS,v 1.4 2004/01/17 10:16:38 mtm Exp $
+# $FreeBSD: src/etc/rc.d/SERVERS,v 1.5 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: SERVERS
# REQUIRE: mountcritremote
-# KEYWORD: FreeBSD
# This is a dummy dependency, for early-start servers relying on
# some basic configuration.
==== //depot/projects/hammer/etc/rc.d/abi#4 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/abi,v 1.3 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/abi,v 1.4 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: abi
# REQUIRE: LOGIN
# BEFORE: securelevel
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/accounting#7 (text+ko) ====
@@ -1,13 +1,13 @@
#!/bin/sh
#
# $NetBSD: accounting,v 1.7 2002/03/22 04:33:57 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/accounting,v 1.8 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/accounting,v 1.9 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: accounting
# REQUIRE: mountcritremote
# BEFORE: DAEMON
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/addswap#4 (text+ko) ====
@@ -2,13 +2,13 @@
#
# Add additional swap files
#
-# $FreeBSD: src/etc/rc.d/addswap,v 1.3 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/addswap,v 1.4 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: addswap
# REQUIRE: mountcritlocal
# BEFORE: sysctl
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/adjkerntz#5 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.4 2004/04/12 18:11:00 brooks Exp $
+# $FreeBSD: src/etc/rc.d/adjkerntz,v 1.5 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: adjkerntz
# REQUIRE: mountcritlocal random
# BEFORE: netif
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/amd#8 (text+ko) ====
@@ -1,13 +1,13 @@
#!/bin/sh
#
# $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
-# $FreeBSD: src/etc/rc.d/amd,v 1.13 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/amd,v 1.14 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: amd
# REQUIRE: rpcbind ypbind nfsclient
# BEFORE: DAEMON
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/apm#6 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/apm,v 1.5 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/apm,v 1.6 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: apm
# REQUIRE: DAEMON
# BEFORE: LOGIN
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/apmd#9 (text+ko) ====
@@ -1,13 +1,13 @@
#!/bin/sh
#
# $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/apmd,v 1.11 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/apmd,v 1.12 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: apmd
# REQUIRE: DAEMON apm
# BEFORE: LOGIN
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/archdep#7 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/archdep,v 1.6 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/archdep,v 1.7 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: archdep
# REQUIRE: LOGIN
# BEFORE: abi
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/atm1#6 (text+ko) ====
@@ -24,13 +24,13 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/atm1,v 1.14 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/atm1,v 1.15 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: atm1
# REQUIRE: root
# BEFORE: netif
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/atm2#3 (text+ko) ====
@@ -24,13 +24,13 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/atm2,v 1.15 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/atm2,v 1.16 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: atm2
# REQUIRE: atm1 netif
# BEFORE: routing
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
#
# Additional ATM interface configuration
==== //depot/projects/hammer/etc/rc.d/atm3#4 (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/atm3,v 1.13 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/atm3,v 1.14 2004/10/07 13:55:25 mtm Exp $
#
# Start ATM daemons
@@ -32,7 +32,7 @@
# PROVIDE: atm3
# REQUIRE: atm2
# BEFORE: DAEMON
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/bgfsck#5 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/bgfsck,v 1.5 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/bgfsck,v 1.6 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: bgfsck
# REQUIRE: cron devfs
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/bootparams#5 (text+ko) ====
@@ -1,13 +1,13 @@
#!/bin/sh
#
# $NetBSD: bootparams,v 1.6 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/bootparams,v 1.6 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/bootparams,v 1.7 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: bootparams
# REQUIRE: rpcbind DAEMON
# BEFORE: LOGIN
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/ccd#4 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: ccd,v 1.3 2000/05/13 08:45:06 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ccd,v 1.4 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/ccd,v 1.5 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: disks
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/cleanvar#7 (text+ko) ====
@@ -1,11 +1,10 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/cleanvar,v 1.6 2004/03/23 23:22:34 brooks Exp $
+# $FreeBSD: src/etc/rc.d/cleanvar,v 1.7 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: cleanvar
# REQUIRE: mountcritlocal var
-# KEYWORD: FreeBSD
purgedir()
{
==== //depot/projects/hammer/etc/rc.d/cleartmp#9 (text+ko) ====
@@ -1,13 +1,12 @@
#!/bin/sh
#
# $NetBSD: cleartmp,v 1.4 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/cleartmp,v 1.10 2004/03/23 23:22:34 brooks Exp $
+# $FreeBSD: src/etc/rc.d/cleartmp,v 1.11 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: cleartmp
# REQUIRE: mountcritremote tmp
# BEFORE: DAEMON
-# KEYWORD: FreeBSD
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/cron#5 (text+ko) ====
@@ -1,13 +1,13 @@
#!/bin/sh
#
# $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD: src/etc/rc.d/cron,v 1.5 2004/01/17 10:16:38 mtm Exp $
+# $FreeBSD: src/etc/rc.d/cron,v 1.6 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: cron
# REQUIRE: LOGIN
# BEFORE: securelevel
-# KEYWORD: FreeBSD shutdown
+# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/devd#4 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/devd,v 1.6 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/devd,v 1.7 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: devd
# REQUIRE: NETWORKING
# BEFORE: mountcritremote
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/devfs#9 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/devfs,v 1.8 2004/03/20 07:10:16 green Exp $
+# $FreeBSD: src/etc/rc.d/devfs,v 1.9 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: devfs
# REQUIRE: LOGIN
# BEFORE: securelevel
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/dhclient#12 (text+ko) ====
@@ -1,13 +1,13 @@
#!/bin/sh
#
# $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/dhclient,v 1.16 2004/05/20 14:16:04 mtm Exp $
+# $FreeBSD: src/etc/rc.d/dhclient,v 1.17 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: dhclient
# REQUIRE: netif ipfw ipfilter mountcritlocal
# BEFORE: NETWORKING
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
#
# Note that there no syslog logging of dhclient messages at boot because
# dhclient needs to start before services that syslog depends upon do.
==== //depot/projects/hammer/etc/rc.d/dmesg#3 (text+ko) ====
@@ -1,13 +1,13 @@
#!/bin/sh
#
# $NetBSD: dmesg,v 1.8 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/dmesg,v 1.3 2004/03/08 12:25:05 pjd Exp $
+# $FreeBSD: src/etc/rc.d/dmesg,v 1.4 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: dmesg
# REQUIRE: mountcritremote
# BEFORE: DAEMON
-# KEYWORD: FreeBSD Daemon nojail
+# KEYWORD: Daemon nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/dumpon#5 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/dumpon,v 1.4 2004/09/20 17:48:45 des Exp $
+# $FreeBSD: src/etc/rc.d/dumpon,v 1.5 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: dumpon
# REQUIRE: initrandom
# BEFORE: disks savecore
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/early.sh#2 (text+ko) ====
@@ -1,12 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/early.sh,v 1.1 2003/04/24 08:27:29 mtm Exp $
+# $FreeBSD: src/etc/rc.d/early.sh,v 1.2 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: early
# REQUIRE: disks localswap
# BEFORE: fsck
-# KEYWORD: FreeBSD
#
# Support for legacy /etc/rc.early script
==== //depot/projects/hammer/etc/rc.d/fsck#6 (text+ko) ====
@@ -1,12 +1,12 @@
#!/bin/sh
#
# $NetBSD: fsck,v 1.2 2001/06/18 06:42:35 lukem Exp $
-# $FreeBSD: src/etc/rc.d/fsck,v 1.9 2004/03/11 20:00:10 kientzle Exp $
+# $FreeBSD: src/etc/rc.d/fsck,v 1.10 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: fsck
# REQUIRE: localswap
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/gbde#6 (text+ko) ====
@@ -3,11 +3,11 @@
# This file, originally written by Garrett A. Wollman, is in the public
# domain.
#
-# $FreeBSD: src/etc/rc.d/gbde,v 1.6 2004/10/06 14:42:35 pjd Exp $
+# $FreeBSD: src/etc/rc.d/gbde,v 1.9 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: disks
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
@@ -79,26 +79,25 @@
gbde_start()
{
for device in $gbde_devices; do
- parentdev=${device%.bde}
- parent=${parentdev#/dev/}
+ parent=${device%.bde}
+ parent=${parent#/dev/}
eval "lock=\${gbde_lock_${parent}-\"${gbde_lockdir}/${parent}.lock\"}"
- if [ ! -e "${device}" ]; then
- echo "Configuring Disk Encryption for ${device}."
+ if [ -e "/dev/${parent}" -a ! -e "/dev/${parent}.bde" ]; then
+ echo "Configuring Disk Encryption for ${parent}."
count=1
while [ ${count} -le ${gbde_attach_attempts} ]; do
if [ -e "${lock}" ]; then
- gbde attach ${parentdev} -l ${lock}
+ gbde attach ${parent} -l ${lock}
else
- gbde attach ${parentdev}
+ gbde attach ${parent}
fi
- if [ -e ${device} ]; then
+ if [ -e "/dev/${parent}.bde" ]; then
break
fi
echo "Attach failed; attempt ${count} of ${gbde_attach_attempts}."
count=$((${count} + 1))
done
-
fi
done
}
@@ -106,8 +105,12 @@
gbde_stop()
{
for device in $gbde_devices; do
- umount ${device}
- gbde detach ${device%.bde}
+ parent=${device%.bde}
+ parent=${parent#/dev/}
+ if [ -e "/dev/${parent}.bde" ]; then
+ umount "/dev/${parent}.bde" 2>/dev/null
+ gbde detach "${parent}"
+ fi
done
}
==== //depot/projects/hammer/etc/rc.d/gbde_swap#4 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/gbde_swap,v 1.5 2004/08/18 21:54:40 thomas Exp $
+# $FreeBSD: src/etc/rc.d/gbde_swap,v 1.6 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: disks
# REQUIRE: initrandom
-# KEYWORD: FreeBSD nojail
+# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/hammer/etc/rc.d/hostname#7 (text+ko) ====
@@ -23,13 +23,12 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/hostname,v 1.7 2004/04/02 12:18:40 krion Exp $
+# $FreeBSD: src/etc/rc.d/hostname,v 1.8 2004/10/07 13:55:25 mtm Exp $
#
# PROVIDE: hostname
# REQUIRE: mountcritlocal
# BEFORE: netif
-# KEYWORD: FreeBSD
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list