Date: Sun, 27 Jan 2008 02:19:39 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 134176 for review Message-ID: <200801270219.m0R2JdEg000782@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=134176 Change 134176 by kmacy@kmacy:storage:toehead on 2008/01/27 02:19:16 IFC 134174 Affected files ... .. //depot/projects/toehead/LOCKS#2 integrate .. //depot/projects/toehead/MAINTAINERS#2 integrate .. //depot/projects/toehead/Makefile.inc1#4 integrate .. //depot/projects/toehead/ObsoleteFiles.inc#3 integrate .. //depot/projects/toehead/UPDATING#3 integrate .. //depot/projects/toehead/etc/defaults/rc.conf#4 integrate .. //depot/projects/toehead/etc/devd.conf#2 integrate .. //depot/projects/toehead/etc/netstart#2 integrate .. //depot/projects/toehead/etc/rc#2 integrate .. //depot/projects/toehead/etc/rc.d/hostid#2 integrate .. //depot/projects/toehead/etc/rc.d/ipfw#2 integrate .. //depot/projects/toehead/etc/rc.d/kerberos#2 integrate .. //depot/projects/toehead/etc/rc.d/mountcritremote#2 integrate .. //depot/projects/toehead/etc/rc.d/netif#2 integrate .. //depot/projects/toehead/etc/rc.d/ppp#2 integrate .. //depot/projects/toehead/etc/rc.subr#2 integrate .. //depot/projects/toehead/gnu/lib/csu/Makefile#2 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/Makefile#2 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kgdb.h#3 integrate .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kld.c#1 branch .. //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/trgt.c#3 integrate .. //depot/projects/toehead/include/fts.h#2 integrate .. //depot/projects/toehead/lib/libarchive/Makefile#3 integrate .. //depot/projects/toehead/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/toehead/lib/libarchive/test/test_write_disk.c#3 integrate .. //depot/projects/toehead/lib/libarchive/test/test_write_format_cpio_newc.c#2 integrate .. //depot/projects/toehead/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/toehead/lib/libc/gen/Symbol.map#2 integrate .. //depot/projects/toehead/lib/libc/gen/fts-compat.c#2 integrate .. //depot/projects/toehead/lib/libc/gen/fts-compat.h#2 integrate .. //depot/projects/toehead/lib/libc/gen/fts.3#2 integrate .. //depot/projects/toehead/lib/libc/gen/fts.c#2 integrate .. //depot/projects/toehead/lib/libc/locale/Makefile.inc#2 integrate .. //depot/projects/toehead/lib/libc/locale/ascii.c#1 branch .. //depot/projects/toehead/lib/libc/locale/mblocal.h#2 integrate .. //depot/projects/toehead/lib/libc/locale/setrunelocale.c#2 integrate .. //depot/projects/toehead/lib/libc/sys/flock.2#2 integrate .. //depot/projects/toehead/lib/libfetch/ftp.c#4 integrate .. //depot/projects/toehead/lib/msun/src/k_cos.c#2 integrate .. //depot/projects/toehead/release/amd64/boot_crunch.conf#2 integrate .. //depot/projects/toehead/release/i386/boot_crunch.conf#2 integrate .. //depot/projects/toehead/release/ia64/boot_crunch.conf#2 integrate .. //depot/projects/toehead/release/pc98/boot_crunch.conf#2 integrate .. //depot/projects/toehead/release/powerpc/boot_crunch.conf#2 integrate .. //depot/projects/toehead/release/sparc64/boot_crunch.conf#2 integrate .. //depot/projects/toehead/release/sun4v/boot_crunch.conf#2 integrate .. //depot/projects/toehead/sbin/dhclient/dhclient-script#2 integrate .. //depot/projects/toehead/sbin/ipfw/ipfw2.c#4 integrate .. //depot/projects/toehead/sbin/natd/natd.8#4 integrate .. //depot/projects/toehead/sbin/quotacheck/Makefile#2 integrate .. //depot/projects/toehead/sbin/quotacheck/preen.c#2 integrate .. //depot/projects/toehead/sbin/quotacheck/quotacheck.8#2 integrate .. //depot/projects/toehead/sbin/quotacheck/quotacheck.c#3 integrate .. //depot/projects/toehead/sbin/quotacheck/quotacheck.h#1 branch .. //depot/projects/toehead/share/man/man4/Makefile#4 integrate .. //depot/projects/toehead/share/man/man4/coda.4#1 branch .. //depot/projects/toehead/share/man/man4/dcons.4#2 integrate .. //depot/projects/toehead/share/man/man4/oldcard.4#2 delete .. //depot/projects/toehead/share/man/man4/puc.4#2 integrate .. //depot/projects/toehead/share/man/man4/sched_4bsd.4#2 integrate .. //depot/projects/toehead/share/man/man4/sched_ule.4#2 integrate .. //depot/projects/toehead/share/man/man4/syncache.4#3 integrate .. //depot/projects/toehead/share/man/man4/xl.4#2 integrate .. //depot/projects/toehead/share/man/man5/fstab.5#2 integrate .. //depot/projects/toehead/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/toehead/share/man/man7/ports.7#4 integrate .. //depot/projects/toehead/share/man/man9/BUF_ISLOCKED.9#1 branch .. //depot/projects/toehead/share/man/man9/BUF_RECURSED.9#1 branch .. //depot/projects/toehead/share/man/man9/BUF_REFCNT.9#2 delete .. //depot/projects/toehead/share/man/man9/Makefile#2 integrate .. //depot/projects/toehead/share/man/man9/lock.9#3 integrate .. //depot/projects/toehead/share/mk/bsd.own.mk#5 integrate .. //depot/projects/toehead/share/mklocale/la_LN.US-ASCII.src#2 integrate .. //depot/projects/toehead/sys/Makefile#2 integrate .. //depot/projects/toehead/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/toehead/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/toehead/sys/conf/files#6 integrate .. //depot/projects/toehead/sys/conf/options#4 integrate .. //depot/projects/toehead/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/toehead/sys/ddb/db_capture.c#2 integrate .. //depot/projects/toehead/sys/dev/amr/amr.c#3 integrate .. //depot/projects/toehead/sys/dev/amr/amrreg.h#2 integrate .. //depot/projects/toehead/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/toehead/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/toehead/sys/dev/mii/miidevs#2 integrate .. //depot/projects/toehead/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/toehead/sys/dev/mii/nsphyter.c#1 branch .. //depot/projects/toehead/sys/dev/mii/nsphyterreg.h#1 branch .. //depot/projects/toehead/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/toehead/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/toehead/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/toehead/sys/dev/usb/ehci.c#3 integrate .. //depot/projects/toehead/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/toehead/sys/dev/usb/uark.c#2 integrate .. //depot/projects/toehead/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/toehead/sys/dev/usb/uftdireg.h#2 integrate .. //depot/projects/toehead/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/toehead/sys/fs/cd9660/cd9660_vfsops.c#3 integrate .. //depot/projects/toehead/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/toehead/sys/fs/hpfs/hpfs_subr.h#3 integrate .. //depot/projects/toehead/sys/fs/hpfs/hpfs_vfsops.c#3 integrate .. //depot/projects/toehead/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/toehead/sys/fs/ntfs/ntfs_subr.c#3 integrate .. //depot/projects/toehead/sys/fs/nullfs/null_vnops.c#3 integrate .. //depot/projects/toehead/sys/fs/nwfs/nwfs_node.c#3 integrate .. //depot/projects/toehead/sys/fs/smbfs/smbfs_node.c#3 integrate .. //depot/projects/toehead/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/toehead/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/toehead/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/toehead/sys/gnu/fs/reiserfs/reiserfs_inode.c#3 integrate .. //depot/projects/toehead/sys/kern/kern_jail.c#3 integrate .. //depot/projects/toehead/sys/kern/kern_lock.c#3 integrate .. //depot/projects/toehead/sys/kern/sched_ule.c#5 integrate .. //depot/projects/toehead/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/toehead/sys/kern/tty_pty.c#3 integrate .. //depot/projects/toehead/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/toehead/sys/kern/vfs_default.c#3 integrate .. //depot/projects/toehead/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/toehead/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/toehead/sys/modules/cxgb/cxgb/Makefile#3 integrate .. //depot/projects/toehead/sys/modules/mii/Makefile#2 integrate .. //depot/projects/toehead/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/toehead/sys/netgraph/ng_pred1.c#2 integrate .. //depot/projects/toehead/sys/netinet/in.c#2 integrate .. //depot/projects/toehead/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/toehead/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/toehead/sys/netinet/ip_options.c#2 integrate .. //depot/projects/toehead/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/toehead/sys/netinet6/in6.c#4 integrate .. //depot/projects/toehead/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/toehead/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/toehead/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/toehead/sys/netinet6/udp6_usrreq.c#4 integrate .. //depot/projects/toehead/sys/netncp/ncp_conn.c#2 integrate .. //depot/projects/toehead/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/toehead/sys/nfs4client/nfs4_idmap.c#2 integrate .. //depot/projects/toehead/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/toehead/sys/powerpc/powermac/ata_kauai.c#2 integrate .. //depot/projects/toehead/sys/sys/buf.h#4 integrate .. //depot/projects/toehead/sys/sys/event.h#2 integrate .. //depot/projects/toehead/sys/sys/lockmgr.h#4 integrate .. //depot/projects/toehead/sys/sys/param.h#4 integrate .. //depot/projects/toehead/sys/sys/priv.h#3 integrate .. //depot/projects/toehead/sys/ufs/ffs/ffs_snapshot.c#3 integrate .. //depot/projects/toehead/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/toehead/sys/ufs/ffs/ffs_vnops.c#3 integrate .. //depot/projects/toehead/sys/ufs/ufs/ufs_extattr.c#3 integrate .. //depot/projects/toehead/tools/sched/schedgraph.py#3 integrate .. //depot/projects/toehead/usr.bin/fstat/Makefile#2 integrate .. //depot/projects/toehead/usr.bin/fstat/zfs/Makefile#2 integrate .. //depot/projects/toehead/usr.bin/mklocale/mklocale.1#2 integrate .. //depot/projects/toehead/usr.bin/mklocale/yacc.y#2 integrate .. //depot/projects/toehead/usr.bin/tar/bsdtar.1#3 integrate .. //depot/projects/toehead/usr.bin/tar/bsdtar.c#3 integrate .. //depot/projects/toehead/usr.bin/xargs/xargs.1#2 integrate .. //depot/projects/toehead/usr.sbin/iostat/iostat.c#4 integrate .. //depot/projects/toehead/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/toehead/usr.sbin/setfmac/setfmac.c#2 integrate .. //depot/projects/toehead/usr.sbin/sysinstall/menus.c#3 integrate Differences ... ==== //depot/projects/toehead/LOCKS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/LOCKS,v 1.3 2006/01/13 06:51:43 ru Exp $ +$FreeBSD: src/LOCKS,v 1.4 2008/01/24 22:07:03 cperciva Exp $ This file documents formal review/approval requirements that have been approved by core. @@ -10,3 +10,4 @@ src/* RELENG_4_* Requires Security Officer approval. src/* RELENG_5_* Requires Security Officer approval. src/* RELENG_6_* Requires Security Officer approval. +src/* RELENG_7_* Requires Security Officer approval. ==== //depot/projects/toehead/MAINTAINERS#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.145 2007/05/23 21:47:19 jfv Exp $ +$FreeBSD: src/MAINTAINERS,v 1.146 2008/01/26 21:58:52 brueffer Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -33,7 +33,6 @@ ahc(4) gibbs Pre-commit review requested. ahd(4) gibbs Pre-commit review requested. NEWCARD imp Pre-commit review requested. -OLDCARD imp Pre-commit review requested. pci bus imp,jhb Pre-commit review requested. cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. ==== //depot/projects/toehead/Makefile.inc1#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.593 2008/01/21 18:44:54 obrien Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.596 2008/01/23 22:21:36 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -841,6 +841,10 @@ # legacy: Build compatibility shims for the next three targets # legacy: +.if ${BOOTSTRAPPING} < 600034 && ${BOOTSTRAPPING} != 0 + @echo "ERROR: Source upgrades from versions prior to 6.0 not supported."; \ + false +.endif .for _tool in tools/build ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ @@ -876,24 +880,23 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif +.if ${BOOTSTRAPPING} < 800013 +_mklocale= usr.bin/mklocale +.endif + bootstrap-tools: .for _tool in \ + ${_mklocale} \ ${_strfile} \ ${_gperf} \ ${_groff} \ - ${_texinfo} \ - ${_cap_mkdb} \ - ${_colldef} \ - ${_gencat} \ usr.bin/lorder \ usr.bin/makewhatis \ - ${_mklocale} \ usr.bin/rpcgen \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ - ${_crunchgen} \ - ${_pwd_mkdb} + ${_crunchgen} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/toehead/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.125 2008/01/11 13:41:31 jhb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.127 2008/01/26 20:23:25 brueffer Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20080126: oldcard.4 removal +OLD_FILES+=usr/share/man/man4/card.4.gz +OLD_FILES+=usr/share/man/man4/oldcard.4.gz +# 20080122: Removed from the tree +OLD_FILES+=usr/share/man/man9/BUF_REFCNT.9.gz # 20080108: Moved to section 2 OLD_FILES+=usr/share/man/man3/shm_open.3.gz OLD_FILES+=usr/share/man/man3/shm_unlink.3.gz ==== //depot/projects/toehead/UPDATING#3 (text+ko) ==== @@ -19,15 +19,27 @@ related kernel options, INVARIANTS, malloc debugging flags in userland, and various verbose features in the kernel. Many developers choose to disable these features on build machines - to maximize performance. + to maximize performance. (To disable malloc debugging, run + ln -s aj /etc/malloc.conf.) + +20080126: + The fts(3) structures have been changed to use adequate + integer types for their members and so to be able to cope + with huge file trees. The old fts(3) ABI is preserved + through symbol versioning in libc, so third-party binaries + using fts(3) should still work, although they will not take + advantage of the extended types. At the same time, some + third-party software might fail to build after this change + due to unportable assumptions made in its source code about + fts(3) structure members. Such software should be fixed + by its vendor or, in the worst case, in the ports tree. + FreeBSD_version 800015 marks this change for the unlikely + case that a portable fix is impossible. -20080121: +20080123: To upgrade to -current after this date, you must be running - FreeBSD after the RELENG_6 branch point. This means any of the - 6.x releases are supported and should work. Upgrading to current + FreeBSD not older than 6.0-RELEASE. Upgrading to -current from 5.x now requires a stop over at RELENG_6 or RELENG_7 systems. - FreeBSD_version must be 600029 or higher, although this isn't - enforced in the Makefile at this time. 20071128: The ADAPTIVE_GIANT kernel option has been retired because its @@ -957,4 +969,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.514 2008/01/21 22:04:37 imp Exp $ +$FreeBSD: src/UPDATING,v 1.517 2008/01/26 17:09:39 yar Exp $ ==== //depot/projects/toehead/etc/defaults/rc.conf#4 (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.323 2008/01/21 04:41:18 rafan Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.324 2008/01/25 05:23:01 mtm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -239,7 +239,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/toehead/etc/devd.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.38 2007/06/21 22:50:36 njl Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.39 2008/01/26 13:50:38 mtm Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -53,7 +53,7 @@ match "system" "IFNET"; match "type" "LINK_UP"; media-type "ethernet"; - action "/etc/rc.d/dhclient start $subsystem"; + action "/etc/rc.d/dhclient quietstart $subsystem"; }; # @@ -73,7 +73,7 @@ match "system" "IFNET"; match "type" "LINK_UP"; media-type "802.11"; - action "/etc/rc.d/dhclient start $subsystem"; + action "/etc/rc.d/dhclient quietstart $subsystem"; }; # An entry like this might be in a different file, but is included here @@ -91,11 +91,11 @@ # When a USB Bluetooth dongle appears activate it attach 100 { device-name "ubt[0-9]+"; - action "/etc/rc.d/bluetooth start $device-name"; + action "/etc/rc.d/bluetooth quietstart $device-name"; }; detach 100 { device-name "ubt[0-9]+"; - action "/etc/rc.d/bluetooth stop $device-name"; + action "/etc/rc.d/bluetooth quietstop $device-name"; }; # When a USB keyboard arrives, attach it as the console keyboard. @@ -112,7 +112,7 @@ # stops automatically (actually it bombs :) when the device disappears. attach 100 { device-name "ums[0-9]+"; - action "/etc/rc.d/moused start $device-name"; + action "/etc/rc.d/moused quietstart $device-name"; }; # Firmware download into the ActiveWire board. After the firmware download is ==== //depot/projects/toehead/etc/netstart#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/netstart,v 1.67 2006/05/30 02:10:01 brooks Exp $ +# $FreeBSD: src/etc/netstart,v 1.68 2008/01/26 13:37:48 mtm Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -37,29 +37,31 @@ . /etc/rc.subr load_rc_config 'XXX' -/etc/rc.d/devd start -/etc/rc.d/hostname start -/etc/rc.d/ipmon start -/etc/rc.d/ipfilter start -/etc/rc.d/ipnat start -/etc/rc.d/ipfs start -/etc/rc.d/sppp start -# /etc/rc.d/atm1 start -# . /etc/rc.d/atm2.sh start -# . /etc/rc.d/atm3.sh start -/etc/rc.d/netif start -/etc/rc.d/ipsec start -/etc/rc.d/dhclient start -/etc/rc.d/isdnd start -/etc/rc.d/ppp start -/etc/rc.d/ipfw start -/etc/rc.d/ip6fw start -/etc/rc.d/network_ipv6 start -/etc/rc.d/routing start -/etc/rc.d/mroute6d start -/etc/rc.d/route6d start -/etc/rc.d/mrouted start -/etc/rc.d/routed start -/etc/rc.d/nisdomain start +_start=quietstart + +/etc/rc.d/devd ${_start} +/etc/rc.d/hostname ${_start} +/etc/rc.d/ipmon ${_start} +/etc/rc.d/ipfilter ${_start} +/etc/rc.d/ipnat ${_start} +/etc/rc.d/ipfs ${_start} +/etc/rc.d/sppp ${_start} +# /etc/rc.d/atm1 ${_start} +# . /etc/rc.d/atm2.sh ${_start} +# . /etc/rc.d/atm3.sh ${_start} +/etc/rc.d/netif ${_start} +/etc/rc.d/ipsec ${_start} +/etc/rc.d/dhclient ${_start} +/etc/rc.d/isdnd ${_start} +/etc/rc.d/ppp ${_start} +/etc/rc.d/ipfw ${_start} +/etc/rc.d/ip6fw ${_start} +/etc/rc.d/network_ipv6 ${_start} +/etc/rc.d/routing ${_start} +/etc/rc.d/mroute6d ${_start} +/etc/rc.d/route6d ${_start} +/etc/rc.d/mrouted ${_start} +/etc/rc.d/routed ${_start} +/etc/rc.d/nisdomain ${_start} exit 0 ==== //depot/projects/toehead/etc/rc#2 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.340 2007/04/02 22:53:06 des Exp $ +# $FreeBSD: src/etc/rc,v 1.341 2008/01/26 11:22:11 mtm Exp $ # # System startup script run by init on autoboot @@ -56,7 +56,7 @@ rc_fast=yes # run_rc_command(): do fast booting else autoboot=no - _boot="start" + _boot="quietstart" fi dlv=`/sbin/sysctl -n vfs.nfs.diskless_valid 2> /dev/null` ==== //depot/projects/toehead/etc/rc.d/hostid#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/hostid,v 1.7 2007/05/22 13:53:59 rse Exp $ +# $FreeBSD: src/etc/rc.d/hostid,v 1.8 2008/01/24 07:04:12 ru Exp $ # # PROVIDE: hostid @@ -56,7 +56,7 @@ hostid_hardware() { - uuid=`kenv smbios.system.uuid 2>/dev/null` + uuid=`kenv -q smbios.system.uuid` x="[0-9a-f]" y=$x$x$x$x case "${uuid}" in ==== //depot/projects/toehead/etc/rc.d/ipfw#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.15 2007/04/02 15:38:53 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.16 2008/01/26 14:02:19 mtm Exp $ # # PROVIDE: ipfw @@ -24,7 +24,7 @@ if [ -r "${firewall_script}" ]; then if [ -f /etc/rc.d/natd ] ; then - /etc/rc.d/natd start + /etc/rc.d/natd quietstart fi /bin/sh "${firewall_script}" echo 'Firewall rules loaded.' @@ -52,7 +52,7 @@ # ${SYSCTL_W} net.inet.ip.fw.enable=0 if [ -f /etc/rc.d/natd ] ; then - /etc/rc.d/natd stop + /etc/rc.d/natd quietstop fi } ==== //depot/projects/toehead/etc/rc.d/kerberos#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/kerberos,v 1.7 2007/10/19 08:59:59 mtm Exp $ +# $FreeBSD: src/etc/rc.d/kerberos,v 1.8 2008/01/25 05:23:01 mtm Exp $ # # PROVIDE: kerberos @@ -10,7 +10,6 @@ name="kerberos5" rcvar="kerberos5_server_enable" -command_args="--detach" load_rc_config $name command="${kerberos5_server}" ==== //depot/projects/toehead/etc/rc.d/mountcritremote#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.17 2007/12/08 07:20:22 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.18 2008/01/26 14:02:19 mtm Exp $ # # PROVIDE: mountcritremote @@ -65,7 +65,7 @@ done # Cleanup /var again just in case it's a network mount. - /etc/rc.d/cleanvar reload + /etc/rc.d/cleanvar quietreload rm -f /var/run/clean_var /var/spool/lock/clean_var } ==== //depot/projects/toehead/etc/rc.d/netif#2 (text+ko) ==== @@ -22,7 +22,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/netif,v 1.24 2007/07/25 18:08:01 jhb Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.25 2008/01/26 11:22:12 mtm Exp $ # # PROVIDE: netif @@ -72,7 +72,7 @@ if [ -f /etc/rc.d/ipfilter ] ; then # Resync ipfilter - /etc/rc.d/ipfilter resync + /etc/rc.d/ipfilter quietresync fi if [ -f /etc/rc.d/bridge -a -n "$cmdifn" ] ; then /etc/rc.d/bridge start $cmdifn ==== //depot/projects/toehead/etc/rc.d/ppp#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ppp,v 1.15 2007/10/18 17:10:40 emax Exp $ +# $FreeBSD: src/etc/rc.d/ppp,v 1.16 2008/01/26 14:02:19 mtm Exp $ # # PROVIDE: ppp @@ -82,8 +82,8 @@ { # Re-Sync ipfilter and pf so they pick up any new network interfaces # - /etc/rc.d/ipfilter resync - /etc/rc.d/pf resync + /etc/rc.d/ipfilter quietresync + /etc/rc.d/pf quietresync } ppp_stop_profile() { ==== //depot/projects/toehead/etc/rc.subr#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.77 2007/10/09 07:20:44 dougb Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.80 2008/01/26 11:22:11 mtm Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -377,9 +377,10 @@ # If argument has a given prefix, then change the operation as follows: # Prefix Operation # ------ --------- -# fast Skip the pid check, and set rc_fast=yes +# fast Skip the pid check, and set rc_fast=yes, rc_quiet=yes # force Set ${rcvar} to YES, and set rc_force=yes # one Set ${rcvar} to YES +# quiet Don't output some diagnostics, and set rc_quiet=yes # # The following globals are used: # @@ -522,6 +523,8 @@ # # rc_force Not empty if "force" was provided (q.v.) # +# rc_quiet Not empty if "quiet" was provided +# # run_rc_command() { @@ -542,6 +545,7 @@ fast*) # "fast" prefix; don't check pid rc_arg=${rc_arg#fast} rc_fast=yes + rc_quiet=yes ;; force*) # "force prefix; always run rc_force=yes @@ -558,6 +562,11 @@ eval ${rcvar}=YES fi ;; + quiet*) # "quiet" prefix; omit some messages + _rc_prefix=quiet + rc_arg=${rc_arg#${_rc_prefix}} + rc_quiet=yes + ;; esac eval _override_command=\$${name}_program @@ -606,6 +615,12 @@ # if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then if ! checkyesno ${rcvar}; then + if [ -n "${rc_quiet}" ]; then + return 0 + fi + echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to " + echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' " + echo "instead of '${rc_arg}'." return 0 fi fi ==== //depot/projects/toehead/gnu/lib/csu/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.27 2007/10/13 05:50:43 ru Exp $ +# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.28 2008/01/24 07:43:09 ru Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc GCCLIB= ${.CURDIR}/../../../contrib/gcclibs @@ -31,7 +31,7 @@ TGTOBJS= crtsavres.o SRCS+= crtsavres.asm .endif -.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_ARCH} == "sparc64" TGTOBJS= crtfastmath.o SRCS+= crtfastmath.c .endif ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/kgdb/Makefile,v 1.6 2005/02/20 23:06:03 kan Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/kgdb/Makefile,v 1.7 2008/01/24 19:11:13 jhb Exp $ PROG= kgdb${GDB_SUFFIX} -SRCS= main.c kthr.c trgt.c trgt_${TARGET_ARCH}.c +SRCS= main.c kld.c kthr.c trgt.c trgt_${TARGET_ARCH}.c WARNS?= 2 BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/kgdb.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.7 2008/01/17 21:43:12 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.8 2008/01/24 19:11:13 jhb Exp $ */ #ifndef _KGDB_H_ @@ -47,6 +47,7 @@ extern struct kthr *curkthr; +void kgdb_add_kld_cmd(char *, int); void kgdb_target(void); void kgdb_trgt_fetch_registers(int); void kgdb_trgt_store_registers(int); ==== //depot/projects/toehead/gnu/usr.bin/gdb/kgdb/trgt.c#3 (text+ko) ==== @@ -25,16 +25,13 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.6 2008/01/17 21:43:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt.c,v 1.7 2008/01/24 19:11:13 jhb Exp $"); #include <sys/param.h> #include <sys/proc.h> -#include <sys/stat.h> #include <sys/sysctl.h> #include <sys/user.h> -#include <libgen.h> #include <kvm.h> -#include <string.h> #include <defs.h> #include <command.h> @@ -43,9 +40,6 @@ #include <inferior.h> #include <regcache.h> #include <target.h> -#include <objfiles.h> -#include <gdbcore.h> -#include <language.h> #include "kgdb.h" @@ -205,268 +199,6 @@ kgdb_switch_to_thread(thr); } -static int -kld_ok (char *path) -{ - struct stat sb; - - if (stat(path, &sb) == 0 && S_ISREG(sb.st_mode)) - return (1); - return (0); -} - -/* - * Look for a matching file in the following order: - * - filename + ".symbols" (e.g. foo.ko.symbols) - * - filename + ".debug" (e.g. foo.ko.debug) - * - filename (e.g. foo.ko) - * - dirname(kernel) + filename + ".symbols" (e.g. /boot/kernel/foo.ko.symbols) - * - dirname(kernel) + filename + ".debug" (e.g. /boot/kernel/foo.ko.debug) - * - dirname(kernel) + filename (e.g. /boot/kernel/foo.ko) - * - iterate over each path in the module path looking for: - * - dir + filename + ".symbols" (e.g. /boot/modules/foo.ko.symbols) - * - dir + filename + ".debug" (e.g. /boot/modules/foo.ko.debug) - * - dir + filename (e.g. /boot/modules/foo.ko) - */ -static int -find_kld_path (char *filename, char *path, size_t path_size) -{ - CORE_ADDR module_path_addr; - char module_path[PATH_MAX]; - char *kernel_dir, *module_dir, *cp; - - snprintf(path, path_size, "%s.symbols", filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s.debug", filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s", filename); - if (kld_ok(path)) - return (1); - kernel_dir = dirname(kernel); - if (kernel_dir != NULL) { - snprintf(path, path_size, "%s/%s.symbols", kernel_dir, - filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s/%s.debug", kernel_dir, filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s/%s", kernel_dir, filename); - if (kld_ok(path)) - return (1); - } - module_path_addr = kgdb_parse("linker_path"); - if (module_path_addr != 0 && - kvm_read(kvm, module_path_addr, module_path, sizeof(module_path)) == - sizeof(module_path)) { - module_path[PATH_MAX - 1] = '\0'; - cp = module_path; - while ((module_dir = strsep(&cp, ";")) != NULL) { - snprintf(path, path_size, "%s/%s.symbols", module_dir, - filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s/%s.debug", module_dir, - filename); - if (kld_ok(path)) - return (1); - snprintf(path, path_size, "%s/%s", module_dir, - filename); - if (kld_ok(path)) - return (1); - } - } - return (0); -} - -/* - * Read a kernel pointer given a KVA in 'address'. - */ -static CORE_ADDR -read_pointer (CORE_ADDR address) -{ - union { - uint32_t d32; - uint64_t d64; - } val; - - switch (TARGET_PTR_BIT) { - case 32: - if (kvm_read(kvm, address, &val.d32, sizeof(val.d32)) != - sizeof(val.d32)) - return (0); - return (val.d32); - case 64: - if (kvm_read(kvm, address, &val.d64, sizeof(val.d64)) != - sizeof(val.d64)) - return (0); - return (val.d64); - default: - return (0); - } -} - -/* - * Try to find this kld in the kernel linker's list of linker files. - */ -static int -find_kld_address (char *arg, CORE_ADDR *address) -{ - CORE_ADDR kld, filename_addr; - CORE_ADDR off_address, off_filename, off_next; - char kld_filename[PATH_MAX]; - char *filename; - size_t filelen; - - /* Compute offsets of relevant members in struct linker_file. */ - off_address = kgdb_parse("&((struct linker_file *)0)->address"); - off_filename = kgdb_parse("&((struct linker_file *)0)->filename"); - off_next = kgdb_parse("&((struct linker_file *)0)->link.tqe_next"); - if (off_address == 0 || off_filename == 0 || off_next == 0) - return (0); - - filename = basename(arg); - filelen = strlen(filename) + 1; - kld = kgdb_parse("linker_files.tqh_first"); - while (kld != 0) { - /* Try to read this linker file's filename. */ - filename_addr = read_pointer(kld + off_filename); - if (filename_addr == 0) - goto next_kld; - if (kvm_read(kvm, filename_addr, kld_filename, filelen) != - filelen) - goto next_kld; - - /* Compare this kld's filename against our passed in name. */ - if (kld_filename[filelen - 1] != '\0') - goto next_kld; - if (strcmp(kld_filename, filename) != 0) - goto next_kld; - - /* - * We found a match, use its address as the base - * address if we can read it. - */ - *address = read_pointer(kld + off_address); - if (*address == 0) - return (0); - return (1); - - next_kld: - kld = read_pointer(kld + off_next); - } - return (0); -} - -static void -add_section(struct section_addr_info *section_addrs, int *sect_indexp, - char *name, CORE_ADDR address) -{ - int sect_index; - - sect_index = *sect_indexp; - section_addrs->other[sect_index].name = name; - section_addrs->other[sect_index].addr = address; - printf_unfiltered("\t%s_addr = %s\n", name, - local_hex_string(address)); - sect_index++; - *sect_indexp = sect_index; -} - -static void -kgdb_add_kld_cmd (char *arg, int from_tty) -{ - struct section_addr_info *section_addrs; - struct cleanup *cleanup; - char path[PATH_MAX]; - asection *sect; - CORE_ADDR base_addr; - bfd *bfd; - CORE_ADDR text_addr, data_addr, bss_addr, rodata_addr; - int sect_count, sect_index; - - if (!find_kld_path(arg, path, sizeof(path))) { - error("unable to locate kld"); - return; - } - - if (!find_kld_address(arg, &base_addr)) { - error("unable to find kld in kernel"); - return; - } - - /* Open the kld and find the offsets of the various sections. */ - bfd = bfd_openr(path, gnutarget); - if (bfd == NULL) { - error("\"%s\": can't open: %s", path, - bfd_errmsg(bfd_get_error())); - return; - } - cleanup = make_cleanup_bfd_close(bfd); - - if (!bfd_check_format(bfd, bfd_object)) { - do_cleanups(cleanup); - error("\%s\": not an object file", path); - return; - } - - data_addr = bss_addr = rodata_addr = 0; - sect = bfd_get_section_by_name (bfd, ".text"); - if (sect == NULL) { - do_cleanups(cleanup); - error("\"%s\": can't find text section", path); - return; - } - text_addr = bfd_get_section_vma(bfd, sect); - sect_count = 1; - - /* Save the offsets of relevant sections. */ - sect = bfd_get_section_by_name (bfd, ".data"); - if (sect != NULL) { - data_addr = bfd_get_section_vma(bfd, sect); - sect_count++; - } - - sect = bfd_get_section_by_name (bfd, ".bss"); - if (sect != NULL) { - bss_addr = bfd_get_section_vma(bfd, sect); - sect_count++; - } - - sect = bfd_get_section_by_name (bfd, ".rodata"); - if (sect != NULL) { - rodata_addr = bfd_get_section_vma(bfd, sect); - sect_count++; - } - - do_cleanups(cleanup); - - printf_unfiltered("add symbol table from file \"%s\" at\n", path); - - /* Build a section table for symbol_file_add(). */ - section_addrs = alloc_section_addr_info(sect_count); - cleanup = make_cleanup(xfree, section_addrs); >>> TRUNCATED FOR MAIL (1000 lines) <<<home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801270219.m0R2JdEg000782>