Date: Mon, 12 Dec 2005 23:23:48 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 88110 for review Message-ID: <200512122323.jBCNNmlJ089559@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=88110 Change 88110 by peter@peter_daintree on 2005/12/12 23:23:32 IFC @88105 Affected files ... .. //depot/projects/hammer/MAINTAINERS#38 integrate .. //depot/projects/hammer/Makefile.inc1#110 integrate .. //depot/projects/hammer/UPDATING#87 integrate .. //depot/projects/hammer/bin/sh/output.c#5 integrate .. //depot/projects/hammer/bin/sh/sh.1#24 integrate .. //depot/projects/hammer/bin/sh/trap.c#6 integrate .. //depot/projects/hammer/etc/defaults/Makefile#6 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#64 integrate .. //depot/projects/hammer/etc/devd.conf#24 integrate .. //depot/projects/hammer/etc/mtree/BSD.root.dist#15 integrate .. //depot/projects/hammer/etc/rc#18 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#43 integrate .. //depot/projects/hammer/etc/rc.d/devfs#11 integrate .. //depot/projects/hammer/etc/rc.d/dumpon#11 integrate .. //depot/projects/hammer/etc/rc.d/initrandom#6 integrate .. //depot/projects/hammer/etc/rc.d/mixer#6 integrate .. //depot/projects/hammer/etc/rc.d/rcconf.sh#4 delete .. //depot/projects/hammer/etc/rc.d/resolv#5 integrate .. //depot/projects/hammer/etc/rc.subr#31 integrate .. //depot/projects/hammer/etc/usbd.conf#5 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#55 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#24 integrate .. //depot/projects/hammer/lib/msun/src/e_scalbf.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_cbrt.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_cbrtf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_tanhf.c#2 integrate .. //depot/projects/hammer/release/scripts/package-split.py#6 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient.c#9 integrate .. //depot/projects/hammer/sbin/geom/class/concat/geom_concat.c#9 integrate .. //depot/projects/hammer/sbin/geom/class/eli/geom_eli.c#5 integrate .. //depot/projects/hammer/sbin/geom/class/label/geom_label.c#7 integrate .. //depot/projects/hammer/sbin/geom/class/mirror/geom_mirror.c#9 integrate .. //depot/projects/hammer/sbin/geom/class/nop/geom_nop.c#6 integrate .. //depot/projects/hammer/sbin/geom/class/nop/gnop.8#11 integrate .. //depot/projects/hammer/sbin/geom/class/raid3/geom_raid3.c#13 integrate .. //depot/projects/hammer/sbin/geom/class/shsec/geom_shsec.c#5 integrate .. //depot/projects/hammer/sbin/geom/class/stripe/geom_stripe.c#12 integrate .. //depot/projects/hammer/sbin/geom/core/geom.c#12 integrate .. //depot/projects/hammer/sbin/geom/misc/subr.c#5 integrate .. //depot/projects/hammer/sbin/geom/misc/subr.h#5 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#32 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#19 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#46 integrate .. //depot/projects/hammer/sbin/ldconfig/ldconfig.8#7 integrate .. //depot/projects/hammer/sbin/mount/mount.c#22 integrate .. //depot/projects/hammer/share/examples/ses/Makefile.inc#3 integrate .. //depot/projects/hammer/share/examples/ses/getencstat/Makefile#2 integrate .. //depot/projects/hammer/share/examples/ses/sesd/Makefile#2 integrate .. //depot/projects/hammer/share/examples/ses/setencstat/Makefile#2 integrate .. //depot/projects/hammer/share/examples/ses/setobjstat/Makefile#2 integrate .. //depot/projects/hammer/share/man/man4/ataraid.4#6 integrate .. //depot/projects/hammer/share/man/man4/crypto.4#5 integrate .. //depot/projects/hammer/share/man/man4/iwi.4#8 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#33 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/padlock.4#1 branch .. //depot/projects/hammer/share/man/man5/Makefile#15 integrate .. //depot/projects/hammer/share/man/man5/config.5#7 delete .. //depot/projects/hammer/share/man/man5/rc.conf.5#66 integrate .. //depot/projects/hammer/share/man/man8/diskless.8#13 integrate .. //depot/projects/hammer/sys/alpha/include/pmap.h#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#35 integrate .. //depot/projects/hammer/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#34 integrate .. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#43 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#61 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#112 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#83 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#19 integrate .. //depot/projects/hammer/sys/amd64/include/apicvar.h#38 integrate .. //depot/projects/hammer/sys/amd64/include/asmacros.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/frame.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#20 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#57 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#29 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#53 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#22 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#54 integrate .. //depot/projects/hammer/sys/amd64/isa/icu.h#23 integrate .. //depot/projects/hammer/sys/arm/arm/bcopyinout_xscale.S#6 integrate .. //depot/projects/hammer/sys/arm/include/atomic.h#13 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_aau.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_dma.c#2 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/i80321_timer.c#7 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/iq31244_machdep.c#16 integrate .. //depot/projects/hammer/sys/arm/xscale/i80321/std.iq31244#3 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#38 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#37 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#35 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#35 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#35 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#39 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_signal.h#13 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#29 integrate .. //depot/projects/hammer/sys/compat/linux/linux_util.h#8 integrate .. //depot/projects/hammer/sys/conf/NOTES#102 integrate .. //depot/projects/hammer/sys/conf/files#133 integrate .. //depot/projects/hammer/sys/conf/files.amd64#82 integrate .. //depot/projects/hammer/sys/conf/files.i386#69 integrate .. //depot/projects/hammer/sys/conf/files.pc98#52 integrate .. //depot/projects/hammer/sys/conf/kern.pre.mk#42 integrate .. //depot/projects/hammer/sys/conf/options#90 integrate .. //depot/projects/hammer/sys/conf/options.amd64#40 integrate .. //depot/projects/hammer/sys/conf/options.arm#6 integrate .. //depot/projects/hammer/sys/conf/options.i386#44 integrate .. //depot/projects/hammer/sys/conf/options.pc98#40 integrate .. //depot/projects/hammer/sys/contrib/dev/nve/adapter.h#2 integrate .. //depot/projects/hammer/sys/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/nve/i386/nvenetlib.o.bz2.uu#2 integrate .. //depot/projects/hammer/sys/contrib/dev/nve/nvenet_version.h#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpi_perf.c#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#64 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#31 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#58 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#28 integrate .. //depot/projects/hammer/sys/dev/em/README#10 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#55 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#21 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#15 integrate .. //depot/projects/hammer/sys/dev/nve/if_nvereg.h#6 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#24 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#50 integrate .. //depot/projects/hammer/sys/dev/ti/if_ti.c#1 branch .. //depot/projects/hammer/sys/dev/ti/if_tireg.h#1 branch .. //depot/projects/hammer/sys/dev/ti/ti_fw.h#1 branch .. //depot/projects/hammer/sys/dev/ti/ti_fw2.h#1 branch .. //depot/projects/hammer/sys/dev/uart/uart_cpu_alpha.c#9 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_amd64.c#8 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_i386.c#8 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_ia64.c#9 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_pc98.c#10 integrate .. //depot/projects/hammer/sys/dev/uart/uart_subr.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#23 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.c#13 integrate .. //depot/projects/hammer/sys/geom/nop/g_nop.c#7 integrate .. //depot/projects/hammer/sys/geom/nop/g_nop.h#4 integrate .. //depot/projects/hammer/sys/geom/zero/g_zero.c#2 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/atomic.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/debug.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/debug.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/kdb.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/kdb.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/kmem.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/kmem.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/ktrace.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/ktrace.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/move.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/mrlock.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/mrlock.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/mutex.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/rwlock.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/rwsem.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/sema.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/spin.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/support.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/sv.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/time.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/uuid.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/support/uuid.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_buf.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_buf.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_config.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_cred.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_dmistubs.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_frw.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_frw.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_fs_subr.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_globals.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_iget.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_node.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_stats.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_super.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_sysctl.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_version.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vfs.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_acl.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_acl.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_ag.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_alloc.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_alloc.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_alloc_btree.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_alloc_btree.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_arch.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_attr.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_attr.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_attr_leaf.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_attr_leaf.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_attr_sf.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_behavior.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_behavior.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_bit.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_bit.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_bmap.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_bmap.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_bmap_btree.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_bmap_btree.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_btree.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_btree.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_buf_item.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_buf_item.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_cap.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_cap.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_clnt.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_da_btree.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_da_btree.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dfrag.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dfrag.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dinode.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_block.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_block.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_data.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_data.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_leaf.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_leaf.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_node.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_node.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_sf.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_sf.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_trace.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir2_trace.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir_leaf.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir_leaf.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dir_sf.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dmapi.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dmops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_error.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_error.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_extfree_item.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_extfree_item.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_fs.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_fsops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_fsops.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_ialloc.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_ialloc.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_ialloc_btree.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_ialloc_btree.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_imap.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_inode.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_inode.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_inode_item.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_inode_item.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_inum.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_iocore.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_iomap.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_iomap.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_itable.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_itable.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_log.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_log.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_log_priv.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_log_recover.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_log_recover.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_mac.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_mac.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_macros.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_macros.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_mount.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_mount.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_qmops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_quota.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_refcache.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_refcache.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_rename.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_rtalloc.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_rtalloc.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_rw.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_rw.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_sb.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans_ail.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans_buf.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans_extfree.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans_inode.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans_item.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans_priv.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_trans_space.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_types.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_utils.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_utils.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_vfsops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_vnodeops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/xfs/xfsidbg.c#1 branch .. //depot/projects/hammer/sys/i386/i386/bpf_jit_machdep.h#2 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#24 integrate .. //depot/projects/hammer/sys/i386/isa/atpic.c#17 integrate .. //depot/projects/hammer/sys/i386/pci/pci_cfgreg.c#26 integrate .. //depot/projects/hammer/sys/ia64/include/pmap.h#18 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#59 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#54 integrate .. //depot/projects/hammer/sys/kern/kern_mbuf.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#67 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#85 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#23 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#35 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#3 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#62 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#31 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#63 integrate .. //depot/projects/hammer/sys/modules/Makefile#93 integrate .. //depot/projects/hammer/sys/modules/netgraph/bpf/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/ti/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/xfs/Makefile#1 branch .. //depot/projects/hammer/sys/net/bpf.c#43 integrate .. //depot/projects/hammer/sys/net/bpf_filter.c#4 integrate .. //depot/projects/hammer/sys/net/bpf_jitter.c#2 integrate .. //depot/projects/hammer/sys/net/bpf_jitter.h#2 integrate .. //depot/projects/hammer/sys/net80211/_ieee80211.h#4 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.c#19 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_ccmp.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_tkip.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_crypto_wep.c#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.c#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#26 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.c#25 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_ioctl.h#12 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#28 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.c#19 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_proto.h#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#20 integrate .. //depot/projects/hammer/sys/netgraph/ng_bpf.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_hole.c#5 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#16 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#19 integrate .. //depot/projects/hammer/sys/pc98/include/param.h#2 integrate .. //depot/projects/hammer/sys/pci/if_ti.c#38 delete .. //depot/projects/hammer/sys/pci/if_tireg.h#9 delete .. //depot/projects/hammer/sys/pci/ti_fw.h#2 delete .. //depot/projects/hammer/sys/pci/ti_fw2.h#2 delete .. //depot/projects/hammer/sys/powerpc/include/pmap.h#11 integrate .. //depot/projects/hammer/sys/sparc64/include/elf.h#5 integrate .. //depot/projects/hammer/sys/sparc64/include/pmap.h#18 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.c#6 integrate .. //depot/projects/hammer/sys/sys/buf.h#27 integrate .. //depot/projects/hammer/sys/sys/condvar.h#6 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#48 integrate .. //depot/projects/hammer/sys/sys/param.h#71 integrate .. //depot/projects/hammer/sys/sys/signal.h#15 integrate .. //depot/projects/hammer/sys/sys/timers.h#5 integrate .. //depot/projects/hammer/sys/vm/vm_fault.c#34 integrate .. //depot/projects/hammer/tools/regression/geom_concat/Makefile#2 delete .. //depot/projects/hammer/tools/regression/geom_concat/conf.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_concat/runtests.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_concat/test-1.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_concat/test-1.t#2 integrate .. //depot/projects/hammer/tools/regression/geom_concat/test-2.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_concat/test-2.t#2 integrate .. //depot/projects/hammer/tools/regression/geom_mirror/Makefile#2 delete .. //depot/projects/hammer/tools/regression/geom_mirror/conf.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_mirror/runtests.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-1.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-1.t#1 branch .. //depot/projects/hammer/tools/regression/geom_mirror/test-2.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-2.t#1 branch .. //depot/projects/hammer/tools/regression/geom_mirror/test-3.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-3.t#1 branch .. //depot/projects/hammer/tools/regression/geom_mirror/test-4.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-4.t#1 branch .. //depot/projects/hammer/tools/regression/geom_mirror/test-5.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-5.t#1 branch .. //depot/projects/hammer/tools/regression/geom_mirror/test-6.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-6.t#1 branch .. //depot/projects/hammer/tools/regression/geom_mirror/test-7.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_mirror/test-7.t#1 branch .. //depot/projects/hammer/tools/regression/geom_nop/Makefile#2 delete .. //depot/projects/hammer/tools/regression/geom_nop/conf.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_nop/runtests.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_nop/test-1.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_nop/test-1.t#1 branch .. //depot/projects/hammer/tools/regression/geom_nop/test-2.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_nop/test-2.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/Makefile#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/conf.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/runtests.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-1.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-1.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-10.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-10.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-11.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-11.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-12.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-12.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-2.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-2.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-3.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-3.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-4.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-4.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-5.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-5.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-6.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-6.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-7.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-7.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-8.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-8.t#1 branch .. //depot/projects/hammer/tools/regression/geom_raid3/test-9.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_raid3/test-9.t#1 branch .. //depot/projects/hammer/tools/regression/geom_shsec/Makefile#2 delete .. //depot/projects/hammer/tools/regression/geom_shsec/conf.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_shsec/runtests.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_shsec/test-1.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_shsec/test-1.t#1 branch .. //depot/projects/hammer/tools/regression/geom_shsec/test-2.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_shsec/test-2.t#1 branch .. //depot/projects/hammer/tools/regression/geom_stripe/Makefile#2 delete .. //depot/projects/hammer/tools/regression/geom_stripe/conf.sh#1 branch .. //depot/projects/hammer/tools/regression/geom_stripe/runtests.sh#2 delete .. //depot/projects/hammer/tools/regression/geom_stripe/test-1.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_stripe/test-1.t#1 branch .. //depot/projects/hammer/tools/regression/geom_stripe/test-2.sh#3 delete .. //depot/projects/hammer/tools/regression/geom_stripe/test-2.t#1 branch .. //depot/projects/hammer/tools/regression/geom_subr.sh#1 branch .. //depot/projects/hammer/tools/tools/ath/80211debug.c#5 delete .. //depot/projects/hammer/tools/tools/ath/80211stats.c#7 delete .. //depot/projects/hammer/tools/tools/ath/80211watch.c#3 delete .. //depot/projects/hammer/tools/tools/ath/Makefile#6 integrate .. //depot/projects/hammer/tools/tools/ath/athdebug.c#2 delete .. //depot/projects/hammer/tools/tools/ath/athdebug/Makefile#1 branch .. //depot/projects/hammer/tools/tools/ath/athdebug/athdebug.c#1 branch .. //depot/projects/hammer/tools/tools/ath/athstats.c#7 delete .. //depot/projects/hammer/tools/tools/ath/athstats/Makefile#1 branch .. //depot/projects/hammer/tools/tools/ath/athstats/athstats.c#1 branch .. //depot/projects/hammer/tools/tools/net80211/Makefile#1 branch .. //depot/projects/hammer/tools/tools/net80211/wlandebug/Makefile#1 branch .. //depot/projects/hammer/tools/tools/net80211/wlandebug/wlandebug.c#1 branch .. //depot/projects/hammer/tools/tools/net80211/wlanstats/Makefile#1 branch .. //depot/projects/hammer/tools/tools/net80211/wlanstats/wlanstats.c#1 branch .. //depot/projects/hammer/tools/tools/net80211/wlanwatch/Makefile#1 branch .. //depot/projects/hammer/tools/tools/net80211/wlanwatch/wlanwatch.c#1 branch .. //depot/projects/hammer/tools/tools/umastat/umastat.c#2 integrate .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#8 integrate .. //depot/projects/hammer/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#7 integrate .. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.c#10 integrate .. //depot/projects/hammer/usr.bin/locate/locate/fastfind.c#2 integrate .. //depot/projects/hammer/usr.bin/locate/locate/locate.1#8 integrate .. //depot/projects/hammer/usr.bin/locate/locate/locate.c#2 integrate .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#20 integrate .. //depot/projects/hammer/usr.bin/xargs/xargs.1#9 integrate .. //depot/projects/hammer/usr.bin/xargs/xargs.c#11 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#10 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/scr.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sdpd.8#5 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/server.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/server.h#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/srr.c#2 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/sur.c#2 integrate .. //depot/projects/hammer/usr.sbin/config/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/config/config.5#1 branch .. //depot/projects/hammer/usr.sbin/sysinstall/ftp.c#3 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#38 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.126 2005/10/24 08:15:58 ceri Exp $ +$FreeBSD: src/MAINTAINERS,v 1.128 2005/12/12 01:28:19 rodrigc Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -125,6 +125,7 @@ rpc.lockd alfred Will be happy to review code, but not mandatory. truss alfred Will be happy to review code, but not mandatory. rpc alfred Pre-commit review requested. +xfs kan,rodrigc Pre-commit review preferred. pkg_install krion Pre-commit review or approval from portmgr@ requested. linux emul emulation Please discuss changes here. bs{diff,patch} cperciva Pre-commit review requested. ==== //depot/projects/hammer/Makefile.inc1#110 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.526 2005/12/03 05:11:07 ambrisko Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.531 2005/12/07 22:55:29 obrien Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -209,7 +209,12 @@ # 32 bit world LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 -LIB32PREFLAGS= -m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT +.if empty(TARGET_CPUTYPE) +LIB32CPUTYPE= k8 +.else +LIB32CPUTYPE= ${TARGET_CPUTYPE} +.endif +LIB32PREFLAGS= -m32 -march=${LIB32CPUTYPE} -mfancy-math-387 -DCOMPAT_32BIT LIB32POSTFLAGS= -I${LIB32TMP}/usr/include \ -L${LIB32TMP}/usr/lib32 \ -B${LIB32TMP}/usr/lib32 @@ -280,7 +285,7 @@ .endif .else rm -rf ${WORLDTMP}/legacy/usr/include - # XXX - These two can depend on any header file. +# XXX - These two can depend on any header file. rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/ioctl.c rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c .endif @@ -482,7 +487,7 @@ buildenv: @echo Entering world for ${TARGET_ARCH}:${TARGET} - @cd ${.CURDIR} && env ${WMAKEENV} ${SHELL} || true + @cd ${.CURDIR} && env ${WMAKEENV} sh || true TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild32} toolchain: ${TOOLCHAIN_TGTS} @@ -904,24 +909,20 @@ # # cross-tools: Build cross-building tools # -.if (${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386") && \ - ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" _btxld= usr.sbin/btxld .endif - -.if (!defined(NO_RESCUE) || defined(RELEASEDIR)) && \ - ${TARGET_ARCH} != ${MACHINE_ARCH} +.if !defined(NO_RESCUE) || defined(RELEASEDIR) _crunchide= usr.sbin/crunch/crunchide .endif - -.if ${TARGET_ARCH} == "alpha" && ${TARGET_ARCH} != ${MACHINE_ARCH} +.if ${TARGET_ARCH} == "alpha" _elf2exe= usr.sbin/elf2exe .endif - -.if ${TARGET_ARCH} == "i386" && ${TARGET_ARCH} != ${MACHINE_ARCH} && \ - defined(RELEASEDIR) +.if ${TARGET_ARCH} == "i386" && defined(RELEASEDIR) _kgzip= usr.sbin/kgzip .endif +.endif cross-tools: .for _tool in \ ==== //depot/projects/hammer/UPDATING#87 (text+ko) ==== @@ -21,6 +21,12 @@ developers choose to disable these features on build machines to maximize performance. +20051211: + The net80211-related tools in the tools/tools/ath directory + have been moved to tools/tools/net80211 and renamed with a + "wlan" prefix. Scripts that use them should be adjusted + accordingly. + 20051202: Scripts in the local_startup directories (as defined in /etc/defaults/rc.conf) that have the new rc.d semantics will @@ -267,6 +273,13 @@ prefix all make commands with 'env -i '. See the env(1) manual page for more details. + When upgrading from one major version to another it is generally + best to upgrade to the latest code in the currently installed branch + first, then do an upgrade to the new branch. This is the best-tested + upgrade path, and has the highest probability of being successful. + Please try this approach before reporting problems with a major + version upgrade. + To build a kernel ----------------- If you are updating from a prior version of FreeBSD (even one just @@ -445,4 +458,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.427 2005/12/06 10:39:14 glebius Exp $ +$FreeBSD: src/UPDATING,v 1.429 2005/12/11 23:18:58 sam Exp $ ==== //depot/projects/hammer/bin/sh/output.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.19 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/output.c,v 1.20 2005/12/08 21:00:39 stefanf Exp $"); /* * Shell output routines. We use our own output routines because: @@ -134,6 +134,10 @@ { char ch; + if (p[0] == '\0') { + outstr("''", file); + return; + } if (p[strcspn(p, "|&;<>()$`\\\"'")] == '\0' && (!ifsset() || p[strcspn(p, ifsval())] == '\0')) { outstr(p, file); ==== //depot/projects/hammer/bin/sh/sh.1#24 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.115 2005/12/04 18:44:21 stefanf Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.117 2005/12/08 21:18:59 stefanf Exp $ .\" -.Dd December 4, 2005 +.Dd December 8, 2005 .Dt SH 1 .Os .Sh NAME @@ -1509,10 +1509,9 @@ or an alias for . Ar value . -.It Ic echo Oo Fl e | n Oc Op Ar string -Print -.Ar string -to the standard output with a newline appended. +.It Ic echo Oo Fl e | n Oc Op Ar string ... +Print a space-separated list of the arguments to the standard output +and append a newline character. .Bl -tag -width indent .It Fl n Suppress the output of the trailing newline. @@ -1958,6 +1957,7 @@ itself, the second one contains the user and system times for the children. .It Ic trap Oo Ar action Oc Ar signal ... +.It Ic trap Fl l Cause the shell to parse and execute .Ar action when any specified @@ -1969,14 +1969,25 @@ may be used to specify an action that is performed when the shell terminates. The .Ar action -may be null or omitted; +may be an empty string or a dash +.Pq Ar - ; the former causes the specified signal to be ignored and the latter causes the default action to be taken. +Omitting the +.Ar action +is another way to request the default action, for compatibility reasons this +usage is not recommended though. When the shell forks off a subshell, it resets trapped (but not ignored) signals to the default action. The .Ic trap command has no effect on signals that were ignored on entry to the shell. +.Pp +Option +.Fl l +causes the +.Ic trap +command to display a list of valid signal names. .It Ic type Op Ar name ... Interpret each .Ar name ==== //depot/projects/hammer/bin/sh/trap.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.30 2005/09/06 19:30:00 rse Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.31 2005/12/08 20:08:36 stefanf Exp $"); #include <signal.h> #include <unistd.h> @@ -153,15 +153,14 @@ if (argc <= 1) { for (signo = 0 ; signo < sys_nsig ; signo++) { if (signo < NSIG && trap[signo] != NULL) { + out1str("trap -- "); + out1qstr(trap[signo]); if (signo == 0) { - out1fmt("trap -- '%s' %s\n", - trap[signo], "exit"); + out1str(" exit\n"); } else if (sys_signame[signo]) { - out1fmt("trap -- '%s' %s\n", - trap[signo], sys_signame[signo]); + out1fmt(" %s\n", sys_signame[signo]); } else { - out1fmt("trap -- '%s' %d\n", - trap[signo], signo); + out1fmt(" %d\n", signo); } } } ==== //depot/projects/hammer/etc/defaults/Makefile#6 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/etc/defaults/Makefile,v 1.6 2005/11/10 19:09:22 emax Exp $ +# $FreeBSD: src/etc/defaults/Makefile,v 1.7 2005/12/09 15:19:31 ru Exp $ FILES= bluetooth.device.conf devfs.rules pccard.conf periodic.conf rc.conf NO_OBJ= FILESDIR= /etc/defaults -FILESMODE= 444 .include <bsd.prog.mk> ==== //depot/projects/hammer/etc/defaults/rc.conf#64 (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.265 2005/11/24 14:39:41 jkoshy Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.266 2005/12/10 20:21:45 dougb Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -24,6 +24,11 @@ rc_debug="NO" # Set to YES to enable debugging output from rc.d rc_info="NO" # Enables display of informational messages at boot. rcshutdown_timeout="30" # Seconds to wait before terminating rc.shutdown +early_late_divider="mountcritlocal" # Script that separates early/late + # stages of the boot process. Make sure you know + # the ramifications if you change this. + # See rc.conf(5) for more details. + swapfile="NO" # Set to name of swapfile if aux swapfile desired. apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. ==== //depot/projects/hammer/etc/devd.conf#24 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.29 2005/11/12 03:42:56 emax Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.30 2005/12/11 00:18:28 iedowse Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -113,6 +113,35 @@ action "/etc/rc.d/moused start $device-name"; }; +# Firmware download into the ActiveWire board. After the firmware download is +# done the device detaches and reappears as something new and shiny +# automatically. +attach 100 { + match "vendor" "0x0854"; + match "product" "0x0100"; + match "release" "0x0000"; + action "/usr/local/bin/ezdownload -f /usr/local/share/usb/firmware/0854.0100.0_01.hex $device-name"; +}; + +# Firmware download for Entrega Serial DB25 adapter. +attach 100 { + match "vendor" "0x1645"; + match "product" "0x8001"; + match "release" "0x0101"; + action "if ! kldstat -n usio > /dev/null 2>&1 ; then kldload usio; fi /usr/sbin/ezdownload -v -f /usr/share/usb/firmware/1645.8001.0101 /dev/$device-name"; +}; + +# This entry starts the ColdSync tool in daemon mode. Make sure you have an up +# to date /usr/local/etc/palms. We override the 'listen' settings for port and +# type in /usr/local/etc/coldsync.conf. +attach 100 { + device-name "ugen[0-9]+"; + match "vendor" "0x082d"; + match "product" "0x0100"; + match "release" "0x0100"; + action "/usr/local/bin/coldsync -md -p /dev/$device-name -t usb"; +}; + # # Rescan scsi device-names on attach, but not detach. However, it is # disabled by default due to reports of problems. ==== //depot/projects/hammer/etc/mtree/BSD.root.dist#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.74 2005/05/30 20:51:13 rwatson Exp $ +# $FreeBSD: src/etc/mtree/BSD.root.dist,v 1.75 2005/12/11 15:21:18 delphij Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -10,6 +10,8 @@ boot defaults .. + firmware + .. kernel .. modules ==== //depot/projects/hammer/etc/rc#18 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.337 2005/12/02 20:06:07 dougb Exp $ +# $FreeBSD: src/etc/rc,v 1.338 2005/12/10 20:21:45 dougb Exp $ # # System startup script run by init on autoboot @@ -50,12 +50,6 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin export HOME PATH -. /etc/rc.subr - -# Note: the system configuration files are loaded as part of -# the rc.d system (rc.d/rcconf.sh). Do not load them here as it may -# interfere with diskless booting. -# if [ "$1" = autoboot ]; then autoboot=yes _boot="faststart" @@ -70,10 +64,18 @@ sh /etc/rc.initdiskless fi +# Run these after determining whether we are booting diskless in order +# to minimize the number of files that are needed on a diskless system, +# and to make the configuration file variables available to rc itself. +# +. /etc/rc.subr +echo "Loading configuration files." +load_rc_config 'XXX' + skip="-s nostart" [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip -s nojail" -# Do a first pass to get everything up to mountcritremote so that +# Do a first pass to get everything up to $early_late_divider so that # we can do a second pass that includes $local_startup directories # files=`rcorder ${skip} /etc/rc.d/* 2>/dev/null` @@ -82,7 +84,7 @@ run_rc_script ${_rc_elem} ${_boot} case "$_rc_elem" in - */mountcritremote) break ;; + */${early_late_divider}) break ;; esac done @@ -101,7 +103,7 @@ for _rc_elem in ${files}; do case "$_skip_early" in 1) case "$_rc_elem" in - */mountcritremote) _skip_early=0 ;; + */${early_late_divider}) _skip_early=0 ;; esac continue ;; ==== //depot/projects/hammer/etc/rc.d/Makefile#43 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.60 2005/11/10 19:09:22 emax Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.61 2005/12/10 23:23:09 dougb Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -29,7 +29,7 @@ pccard pcvt pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ quota \ - ramdisk ramdisk-own random rarpd rcconf.sh resolv root \ + ramdisk ramdisk-own random rarpd resolv root \ route6d routed routing rpcbind rtadvd rwho \ savecore sdpd securelevel sendmail \ serial sppp swap1 \ ==== //depot/projects/hammer/etc/rc.d/devfs#11 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.10 2004/10/23 06:50:50 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.11 2005/12/10 20:21:45 dougb Exp $ # # PROVIDE: devfs -# REQUIRE: rcconf mountcritremote +# REQUIRE: mountcritremote # BEFORE: SERVERS securelevel # KEYWORD: nojail ==== //depot/projects/hammer/etc/rc.d/dumpon#11 (text+ko) ==== @@ -1,10 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/dumpon,v 1.10 2005/09/13 19:07:02 rwatson Exp $ +# $FreeBSD: src/etc/rc.d/dumpon,v 1.11 2005/12/10 20:21:45 dougb Exp $ # # PROVIDE: dumpon -# REQUIRE: rcconf # BEFORE: disks savecore initrandom # KEYWORD: nojail ==== //depot/projects/hammer/etc/rc.d/initrandom#6 (text+ko) ==== @@ -1,10 +1,9 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/initrandom,v 1.5 2005/03/02 19:03:08 brooks Exp $ +# $FreeBSD: src/etc/rc.d/initrandom,v 1.6 2005/12/10 20:21:45 dougb Exp $ # # PROVIDE: initrandom -# REQUIRE: rcconf # BEFORE: disks # KEYWORD: nojail ==== //depot/projects/hammer/etc/rc.d/mixer#6 (text+ko) ==== @@ -24,11 +24,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/mixer,v 1.5 2005/03/17 22:36:16 njl Exp $ +# $FreeBSD: src/etc/rc.d/mixer,v 1.6 2005/12/10 19:49:03 dougb Exp $ # # PROVIDE: mixer -# BEFORE: LOGIN +# REQUIRE: cleanvar # KEYWORD: nojail shutdown . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.d/resolv#5 (text+ko) ==== @@ -24,11 +24,10 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/resolv,v 1.35 2005/03/02 19:03:08 brooks Exp $ +# $FreeBSD: src/etc/rc.d/resolv,v 1.36 2005/12/10 20:21:45 dougb Exp $ # # PROVIDE: resolv -# REQUIRE: rcconf # KEYWORD: nojail . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.subr#31 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.46 2005/12/06 05:27:11 yar Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.47 2005/12/10 20:19:08 dougb Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -1380,7 +1380,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512122323.jBCNNmlJ089559>