Date: Tue, 6 Dec 2005 18:47:56 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 87810 for review Message-ID: <200512061847.jB6Ilu6D064803@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=87810 Change 87810 by peter@peter_daintree on 2005/12/06 18:47:19 IFC @87804 Affected files ... .. //depot/projects/hammer/Makefile.inc1#109 integrate .. //depot/projects/hammer/UPDATING#86 integrate .. //depot/projects/hammer/bin/sh/builtins.def#5 integrate .. //depot/projects/hammer/bin/sh/eval.c#11 integrate .. //depot/projects/hammer/bin/sh/eval.h#3 integrate .. //depot/projects/hammer/bin/sh/sh.1#23 integrate .. //depot/projects/hammer/etc/rc#17 integrate .. //depot/projects/hammer/etc/rc.d/NETWORKING#10 integrate .. //depot/projects/hammer/etc/rc.d/localpkg#5 integrate .. //depot/projects/hammer/etc/rc.d/root#9 integrate .. //depot/projects/hammer/etc/rc.d/tmp#5 integrate .. //depot/projects/hammer/etc/rc.shutdown#9 integrate .. //depot/projects/hammer/etc/rc.subr#30 integrate .. //depot/projects/hammer/games/fortune/datfiles/fortunes#54 integrate .. //depot/projects/hammer/gnu/usr.bin/man/man/man.c#5 integrate .. //depot/projects/hammer/gnu/usr.bin/man/man/man.man#5 integrate .. //depot/projects/hammer/include/Makefile#51 integrate .. //depot/projects/hammer/include/mqueue.h#2 integrate .. //depot/projects/hammer/include/rpcsvc/yp_prot.h#3 integrate .. //depot/projects/hammer/include/unistd.h#17 integrate .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#25 integrate .. //depot/projects/hammer/lib/libc/gen/__xuname.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/getosreldate.3#2 integrate .. //depot/projects/hammer/lib/libc/gen/getosreldate.c#3 integrate .. //depot/projects/hammer/lib/libc/gen/uname.3#4 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#19 integrate .. //depot/projects/hammer/lib/libc/sys/lio_listio.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/mq_close.2#1 branch .. //depot/projects/hammer/lib/libc/sys/mq_getattr.2#1 branch .. //depot/projects/hammer/lib/libc/sys/mq_notify.2#1 branch .. //depot/projects/hammer/lib/libc/sys/mq_open.2#1 branch .. //depot/projects/hammer/lib/libc/sys/mq_receive.2#1 branch .. //depot/projects/hammer/lib/libc/sys/mq_send.2#1 branch .. //depot/projects/hammer/lib/libc/sys/mq_setattr.2#1 branch .. //depot/projects/hammer/lib/libc/sys/open.2#6 integrate .. //depot/projects/hammer/lib/libc/sys/sigqueue.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/sigreturn.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/timer_create.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/timer_delete.2#3 integrate .. //depot/projects/hammer/lib/libc/sys/timer_settime.2#3 integrate .. //depot/projects/hammer/lib/libedit/refresh.c#3 integrate .. //depot/projects/hammer/lib/libfetch/fetch.3#11 integrate .. //depot/projects/hammer/lib/msun/src/e_asinf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/e_expf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/k_cosf.c#7 integrate .. //depot/projects/hammer/lib/msun/src/k_sinf.c#6 integrate .. //depot/projects/hammer/lib/msun/src/s_cosf.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_log1p.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_log1pf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_logb.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_logbf.c#2 integrate .. //depot/projects/hammer/lib/msun/src/s_rint.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_rintf.c#3 integrate .. //depot/projects/hammer/lib/msun/src/s_round.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_roundf.c#4 integrate .. //depot/projects/hammer/lib/msun/src/s_roundl.c#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#83 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#49 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#45 integrate .. //depot/projects/hammer/sbin/mount/mntopts.h#10 integrate .. //depot/projects/hammer/sbin/mount/mount.c#21 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#12 integrate .. //depot/projects/hammer/sbin/mount_std/Makefile#4 integrate .. //depot/projects/hammer/sbin/ping/ping.c#18 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.c#19 integrate .. //depot/projects/hammer/share/man/man1/Makefile#3 integrate .. //depot/projects/hammer/share/man/man1/builtin.1#7 integrate .. //depot/projects/hammer/share/man/man4/ataraid.4#5 integrate .. //depot/projects/hammer/share/man/man4/da.4#7 integrate .. //depot/projects/hammer/share/man/man4/pcm.4#16 integrate .. //depot/projects/hammer/share/man/man4/snd_fm801.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_mss.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_neomagic.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_t4dwave.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_via8233.4#4 integrate .. //depot/projects/hammer/share/man/man4/snd_via82c686.4#3 integrate .. //depot/projects/hammer/share/man/man4/snd_vibes.4#3 integrate .. //depot/projects/hammer/share/man/man4/uvisor.4#6 integrate .. //depot/projects/hammer/share/man/man5/Makefile#14 integrate .. //depot/projects/hammer/share/man/man5/bluetooth.device.conf.5#1 branch .. //depot/projects/hammer/share/man/man5/config.5#6 integrate .. //depot/projects/hammer/share/man/man5/mqueuefs.5#1 branch .. //depot/projects/hammer/share/man/man5/periodic.conf.5#13 integrate .. //depot/projects/hammer/share/man/man6/intro.6#4 integrate .. //depot/projects/hammer/share/man/man7/build.7#13 integrate .. //depot/projects/hammer/share/man/man9/bus_dma.9#21 integrate .. //depot/projects/hammer/share/man/man9/timeout.9#13 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#29 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#49 integrate .. //depot/projects/hammer/sys/alpha/alpha/trap.c#20 integrate .. //depot/projects/hammer/sys/alpha/include/param.h#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/hammer/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/hammer/sys/amd64/conf/NOTES#91 integrate .. //depot/projects/hammer/sys/amd64/include/param.h#32 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#52 integrate .. //depot/projects/hammer/sys/arm/arm/elf_trampoline.c#3 integrate .. //depot/projects/hammer/sys/arm/arm/inckern.S#2 integrate .. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#19 integrate .. //depot/projects/hammer/sys/arm/include/param.h#7 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#29 integrate .. //depot/projects/hammer/sys/coda/coda_psdev.c#13 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#28 integrate .. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#12 integrate .. //depot/projects/hammer/sys/compat/linux/linux_signal.c#12 integrate .. //depot/projects/hammer/sys/conf/Makefile.arm#15 integrate .. //depot/projects/hammer/sys/conf/NOTES#101 integrate .. //depot/projects/hammer/sys/conf/files#132 integrate .. //depot/projects/hammer/sys/conf/files.amd64#81 integrate .. //depot/projects/hammer/sys/conf/files.i386#68 integrate .. //depot/projects/hammer/sys/conf/files.pc98#51 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#36 integrate .. //depot/projects/hammer/sys/conf/kmod.mk#54 integrate .. //depot/projects/hammer/sys/conf/options#89 integrate .. //depot/projects/hammer/sys/conf/options.amd64#39 integrate .. //depot/projects/hammer/sys/conf/options.i386#43 integrate .. //depot/projects/hammer/sys/conf/options.pc98#39 integrate .. //depot/projects/hammer/sys/conf/systags.sh#4 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/fil.c#11 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_auth.c#7 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_compat.h#10 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil.h#8 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_log.c#8 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pflog.c#16 integrate .. //depot/projects/hammer/sys/contrib/pf/net/if_pfsync.c#21 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf.c#25 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_ioctl.c#20 integrate .. //depot/projects/hammer/sys/contrib/pf/net/pf_norm.c#9 integrate .. //depot/projects/hammer/sys/ddb/db_access.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#34 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pci_link.c#32 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#29 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#48 integrate .. //depot/projects/hammer/sys/dev/advansys/adv_pci.c#11 integrate .. //depot/projects/hammer/sys/dev/advansys/advlib.c#6 integrate .. //depot/projects/hammer/sys/dev/advansys/adw_pci.c#10 integrate .. //depot/projects/hammer/sys/dev/advansys/adwcam.c#12 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#22 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#16 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.h#12 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_pci.c#18 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#17 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.h#15 integrate .. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#6 integrate .. //depot/projects/hammer/sys/dev/asr/dptsig.h#3 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#35 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#63 integrate .. //depot/projects/hammer/sys/dev/ata/ata-dma.c#24 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#33 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#36 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#30 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.h#17 integrate .. //depot/projects/hammer/sys/dev/atkbdc/atkbdc.c#2 integrate .. //depot/projects/hammer/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#57 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_card.c#13 integrate .. //depot/projects/hammer/sys/dev/bktr/bktr_core.c#14 integrate .. //depot/projects/hammer/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/hammer/sys/dev/dc/if_dcreg.h#3 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/ati_pcigart.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm-preprocess.sh#1 branch .. //depot/projects/hammer/sys/dev/drm/drm-subprocess.pl#1 branch .. //depot/projects/hammer/sys/dev/drm/drm.h#9 integrate .. //depot/projects/hammer/sys/dev/drm/drmP.h#13 integrate .. //depot/projects/hammer/sys/dev/drm/drm_agpsupport.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_atomic.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_auth.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_bufs.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/drm_context.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_dma.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drawable.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_fops.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_ioctl.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_linux_list.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_memory.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/drm_sarea.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/drm_vm.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drm.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/i915_mem.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/mach64_dma.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/mach64_drm.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/mach64_state.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/mga_dma.c#10 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drm.h#6 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/mga_drv.h#8 integrate .. //depot/projects/hammer/sys/dev/drm/mga_irq.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/mga_state.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/mga_ucode.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/mga_warp.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/r128_cce.c#11 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drm.h#7 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/r128_drv.h#9 integrate .. //depot/projects/hammer/sys/dev/drm/r128_irq.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/r128_state.c#10 integrate .. //depot/projects/hammer/sys/dev/drm/r300_cmdbuf.c#3 integrate .. //depot/projects/hammer/sys/dev/drm/r300_reg.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_cp.c#13 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drm.h#10 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.c#9 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_drv.h#11 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_irq.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_mem.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/radeon_state.c#12 integrate .. //depot/projects/hammer/sys/dev/drm/savage_bci.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/savage_drm.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/savage_drv.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/savage_drv.h#2 integrate .. //depot/projects/hammer/sys/dev/drm/savage_state.c#2 integrate .. //depot/projects/hammer/sys/dev/drm/sis_drm.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/sis_drv.c#6 integrate .. //depot/projects/hammer/sys/dev/drm/sis_drv.h#4 integrate .. //depot/projects/hammer/sys/dev/drm/sis_ds.c#4 integrate .. //depot/projects/hammer/sys/dev/drm/sis_ds.h#5 integrate .. //depot/projects/hammer/sys/dev/drm/sis_mm.c#7 integrate .. //depot/projects/hammer/sys/dev/drm/tdfx_drv.c#8 integrate .. //depot/projects/hammer/sys/dev/drm/tdfx_drv.h#2 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#54 integrate .. //depot/projects/hammer/sys/dev/em/if_em_osdep.h#11 integrate .. //depot/projects/hammer/sys/dev/esp/ncr53c9x.c#9 integrate .. //depot/projects/hammer/sys/dev/esp/ncr53c9xvar.h#7 integrate .. //depot/projects/hammer/sys/dev/fb/fb.c#8 integrate .. //depot/projects/hammer/sys/dev/fb/fbreg.h#13 integrate .. //depot/projects/hammer/sys/dev/fb/vga.c#22 integrate .. //depot/projects/hammer/sys/dev/gem/if_gem.c#23 integrate .. //depot/projects/hammer/sys/dev/hptmv/hptproc.c#5 integrate .. //depot/projects/hammer/sys/dev/hptmv/mvOs.h#5 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#9 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#9 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#7 integrate .. //depot/projects/hammer/sys/dev/ic/via6522reg.h#1 branch .. //depot/projects/hammer/sys/dev/ie/if_ie_isa.c#5 integrate .. //depot/projects/hammer/sys/dev/ips/ips.c#14 integrate .. //depot/projects/hammer/sys/dev/ips/ips.h#14 integrate .. //depot/projects/hammer/sys/dev/ips/ips_commands.c#15 integrate .. //depot/projects/hammer/sys/dev/ips/ips_disk.c#9 integrate .. //depot/projects/hammer/sys/dev/ips/ips_ioctl.c#8 integrate .. //depot/projects/hammer/sys/dev/ips/ips_pci.c#12 integrate .. //depot/projects/hammer/sys/dev/ips/ipsreg.h#1 branch .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#11 integrate .. //depot/projects/hammer/sys/dev/ispfw/ispfw.c#8 integrate .. //depot/projects/hammer/sys/dev/lmc/if_lmc.c#6 integrate .. //depot/projects/hammer/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt.h#7 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_cam.c#3 integrate .. //depot/projects/hammer/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/hammer/sys/dev/my/if_my.c#23 integrate .. //depot/projects/hammer/sys/dev/nve/if_nve.c#14 integrate .. //depot/projects/hammer/sys/dev/nve/if_nvereg.h#5 integrate .. //depot/projects/hammer/sys/dev/ppc/ppc.c#6 integrate .. //depot/projects/hammer/sys/dev/puc/pucdata.c#23 integrate .. //depot/projects/hammer/sys/dev/ral/if_ral.c#12 integrate .. //depot/projects/hammer/sys/dev/ral/if_ralreg.h#2 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#20 integrate .. //depot/projects/hammer/sys/dev/rp/rp_isa.c#6 integrate .. //depot/projects/hammer/sys/dev/rp/rp_pci.c#9 integrate .. //depot/projects/hammer/sys/dev/rp/rpvar.h#5 integrate .. //depot/projects/hammer/sys/dev/snc/dp83932.c#16 integrate .. //depot/projects/hammer/sys/dev/snc/dp83932var.h#5 integrate .. //depot/projects/hammer/sys/dev/sound/pci/csa.c#9 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/ac97.c#19 integrate .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#18 integrate .. //depot/projects/hammer/sys/dev/syscons/schistory.c#6 integrate .. //depot/projects/hammer/sys/dev/syscons/scterm-dumb.c#4 integrate .. //depot/projects/hammer/sys/dev/syscons/scterm-sc.c#5 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#35 integrate .. //depot/projects/hammer/sys/dev/syscons/sysmouse.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/if_udav.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/if_udavreg.h#6 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#12 integrate .. //depot/projects/hammer/sys/dev/usb/if_uralreg.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/if_uralvar.h#5 integrate .. //depot/projects/hammer/sys/dev/usb/sl811hs.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/uplcom.c#20 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.h#3 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#64 integrate .. //depot/projects/hammer/sys/dev/usb/uvisor.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/uvscom.c#14 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#20 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.c#13 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#18 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_io.c#15 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#16 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#22 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_lock.c#10 integrate .. //depot/projects/hammer/sys/geom/eli/g_eli.c#5 integrate .. //depot/projects/hammer/sys/geom/geom_aes.c#17 integrate .. //depot/projects/hammer/sys/geom/geom_apple.c#11 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#27 integrate .. //depot/projects/hammer/sys/geom/geom_fox.c#6 integrate .. //depot/projects/hammer/sys/geom/geom_gpt.c#24 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#24 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#26 integrate .. //depot/projects/hammer/sys/geom/geom_sunlabel.c#19 integrate .. //depot/projects/hammer/sys/geom/geom_vol_ffs.c#10 integrate .. //depot/projects/hammer/sys/geom/label/g_label_iso9660.c#3 integrate .. //depot/projects/hammer/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/hammer/sys/geom/label/g_label_ntfs.c#3 integrate .. //depot/projects/hammer/sys/geom/label/g_label_ufs.c#4 integrate .. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#26 integrate .. //depot/projects/hammer/sys/geom/raid3/g_raid3.c#19 integrate .. //depot/projects/hammer/sys/geom/uzip/g_uzip.c#7 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#16 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_alloc.c#5 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_balloc.c#3 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_inode.c#3 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#3 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_lookup.c#4 integrate .. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#82 integrate .. //depot/projects/hammer/sys/i386/i386/apic_vector.s#16 integrate .. //depot/projects/hammer/sys/i386/i386/bpf_jit_machdep.c#1 branch .. //depot/projects/hammer/sys/i386/i386/bpf_jit_machdep.h#1 branch .. //depot/projects/hammer/sys/i386/i386/db_trace.c#18 integrate .. //depot/projects/hammer/sys/i386/i386/exception.s#12 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#29 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#19 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#21 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#52 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#78 integrate .. //depot/projects/hammer/sys/i386/include/apicvar.h#15 integrate .. //depot/projects/hammer/sys/i386/include/asmacros.h#4 integrate .. //depot/projects/hammer/sys/i386/include/bus.h#5 integrate .. //depot/projects/hammer/sys/i386/include/frame.h#5 integrate .. //depot/projects/hammer/sys/i386/include/intr_machdep.h#8 integrate .. //depot/projects/hammer/sys/i386/include/param.h#12 integrate .. //depot/projects/hammer/sys/i386/include/smp.h#13 integrate .. //depot/projects/hammer/sys/i386/isa/atpic.c#16 integrate .. //depot/projects/hammer/sys/i386/isa/atpic_vector.s#10 integrate .. //depot/projects/hammer/sys/i386/isa/icu.h#8 integrate .. //depot/projects/hammer/sys/i386/isa/npx.c#27 integrate .. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_hdr.h#10 integrate .. //depot/projects/hammer/sys/i386/isa/vesa.c#13 integrate .. //depot/projects/hammer/sys/i4b/layer1/itjc/i4b_itjc_pci.c#13 integrate .. //depot/projects/hammer/sys/i4b/layer2/i4b_l2timer.c#5 integrate .. //depot/projects/hammer/sys/i4b/layer4/i4b_i4bdrv.c#11 integrate .. //depot/projects/hammer/sys/i4b/layer4/i4b_l4.c#7 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#54 integrate .. //depot/projects/hammer/sys/ia64/include/param.h#12 integrate .. //depot/projects/hammer/sys/isa/vga_isa.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#54 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#58 integrate .. //depot/projects/hammer/sys/kern/kern_pmc.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#66 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#84 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#22 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#51 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#62 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#62 integrate .. //depot/projects/hammer/sys/modules/drm/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/drm/i915/Makefile#1 branch .. //depot/projects/hammer/sys/modules/drm/savage/Makefile#1 branch .. //depot/projects/hammer/sys/modules/if_gif/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/ipfw/Makefile#6 integrate .. //depot/projects/hammer/sys/net/bpf.c#42 integrate .. //depot/projects/hammer/sys/net/bpf_jitter.c#1 branch .. //depot/projects/hammer/sys/net/bpf_jitter.h#1 branch .. //depot/projects/hammer/sys/net/bpfdesc.h#14 integrate .. //depot/projects/hammer/sys/net/if_bridge.c#18 integrate .. //depot/projects/hammer/sys/net/if_ppp.c#25 integrate .. //depot/projects/hammer/sys/net/if_spppsubr.c#24 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#25 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#27 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#18 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#21 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#19 integrate .. //depot/projects/hammer/sys/netgraph/ng_vjc.c#5 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.c#35 integrate .. //depot/projects/hammer/sys/netinet/ip_dummynet.h#14 integrate .. //depot/projects/hammer/sys/netinet/ip_fw.h#25 integrate .. //depot/projects/hammer/sys/netinet/ip_fw2.c#68 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#14 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#56 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#55 integrate .. //depot/projects/hammer/sys/netipsec/key_debug.c#4 integrate .. //depot/projects/hammer/sys/netkey/key_debug.c#7 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_diskless.c#12 integrate .. //depot/projects/hammer/sys/pc98/cbus/fdc.c#3 integrate .. //depot/projects/hammer/sys/pc98/cbus/gdc.c#3 integrate .. //depot/projects/hammer/sys/pc98/cbus/ppc.c#2 integrate .. //depot/projects/hammer/sys/pc98/cbus/scterm-sck.c#2 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#55 integrate .. //depot/projects/hammer/sys/pc98/include/bus.h#4 integrate .. //depot/projects/hammer/sys/pci/agp_i810.c#18 integrate .. //depot/projects/hammer/sys/pci/agp_intel.c#16 integrate .. //depot/projects/hammer/sys/pci/agpreg.h#12 integrate .. //depot/projects/hammer/sys/pci/if_de.c#31 integrate .. //depot/projects/hammer/sys/pci/if_devar.h#12 integrate .. //depot/projects/hammer/sys/pci/viapm.c#11 integrate .. //depot/projects/hammer/sys/powerpc/include/param.h#10 integrate .. //depot/projects/hammer/sys/powerpc/powermac/macio.c#11 integrate .. //depot/projects/hammer/sys/powerpc/powermac/maciovar.h#6 integrate .. //depot/projects/hammer/sys/rpc/rpcclnt.c#12 integrate .. //depot/projects/hammer/sys/sparc64/central/central.c#8 integrate .. //depot/projects/hammer/sys/sparc64/fhc/clkbrd.c#2 integrate .. //depot/projects/hammer/sys/sparc64/include/ktr.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/ofw_upa.h#3 integrate .. //depot/projects/hammer/sys/sparc64/include/param.h#9 integrate .. //depot/projects/hammer/sys/sparc64/isa/ofw_isa.c#7 integrate .. //depot/projects/hammer/sys/sparc64/pci/apb.c#9 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pci.c#10 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pci.h#8 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib.c#5 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcib_subr.c#5 integrate .. //depot/projects/hammer/sys/sparc64/pci/ofw_pcibus.c#8 integrate .. //depot/projects/hammer/sys/sparc64/pci/psycho.c#25 integrate .. //depot/projects/hammer/sys/sparc64/pci/psychoreg.h#7 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/eeprom.c#8 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/genassym.c#12 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/locore.S#6 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/mem.c#12 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/rtc.c#5 integrate .. //depot/projects/hammer/sys/sys/_lock.h#4 integrate .. //depot/projects/hammer/sys/sys/kbio.h#3 integrate .. //depot/projects/hammer/sys/sys/ktr.h#14 integrate .. //depot/projects/hammer/sys/sys/limits.h#10 integrate .. //depot/projects/hammer/sys/sys/lock.h#9 integrate .. //depot/projects/hammer/sys/sys/mount.h#39 integrate .. //depot/projects/hammer/sys/sys/mouse.h#6 integrate .. //depot/projects/hammer/sys/sys/mqueue.h#2 integrate .. //depot/projects/hammer/sys/sys/param.h#70 integrate .. //depot/projects/hammer/sys/sys/pmc.h#7 integrate .. //depot/projects/hammer/sys/sys/proc.h#92 integrate .. //depot/projects/hammer/sys/sys/signal.h#14 integrate .. //depot/projects/hammer/sys/sys/signalvar.h#18 integrate .. //depot/projects/hammer/sys/sys/unistd.h#10 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#52 integrate .. //depot/projects/hammer/sys/vm/vm_map.h#18 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#57 integrate .. //depot/projects/hammer/tools/tools/README#19 integrate .. //depot/projects/hammer/tools/tools/umastat/Makefile#1 branch .. //depot/projects/hammer/tools/tools/umastat/umastat.c#1 branch .. //depot/projects/hammer/tools/tools/upgrade/doupgrade.sh#2 delete .. //depot/projects/hammer/tools/tools/upgrade/getosreldate.sh#2 delete .. //depot/projects/hammer/tools/tools/upgrade/move_aout_libs.sh#3 delete .. //depot/projects/hammer/usr.bin/catman/catman.1#5 integrate .. //depot/projects/hammer/usr.bin/catman/catman.c#10 integrate .. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.c#9 integrate .. //depot/projects/hammer/usr.bin/make/main.c#37 integrate .. //depot/projects/hammer/usr.bin/make/var.c#30 integrate .. //depot/projects/hammer/usr.bin/makewhatis/makewhatis.1#3 integrate .. //depot/projects/hammer/usr.bin/makewhatis/makewhatis.c#3 integrate .. //depot/projects/hammer/usr.bin/rup/rup.c#4 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#5 integrate .. //depot/projects/hammer/usr.sbin/config/lang.l#11 integrate .. //depot/projects/hammer/usr.sbin/config/main.c#12 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#28 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.c#11 integrate .. //depot/projects/hammer/usr.sbin/moused/moused.8#16 integrate .. //depot/projects/hammer/usr.sbin/moused/moused.c#15 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#22 integrate .. //depot/projects/hammer/usr.sbin/portsnap/make_index/make_index.c#4 integrate .. //depot/projects/hammer/usr.sbin/slstat/slstat.8#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/installUpgrade.c#3 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#109 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.523 2005/11/25 10:12:58 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.526 2005/12/03 05:11:07 ambrisko Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -122,7 +122,7 @@ .error CPUTYPE global should be set with ?=. .endif .if make(buildworld) -BUILD_ARCH!= sysctl -n hw.machine_arch +BUILD_ARCH!= uname -p .if ${MACHINE_ARCH} != ${BUILD_ARCH} .error To cross-build, set TARGET_ARCH. .endif @@ -482,7 +482,7 @@ buildenv: @echo Entering world for ${TARGET_ARCH}:${TARGET} - @cd ${.CURDIR} && env ${WMAKEENV} sh || true + @cd ${.CURDIR} && env ${WMAKEENV} ${SHELL} || true TOOLCHAIN_TGTS= ${WMAKE_TGTS:N_depend:Neverything:Nbuild32} toolchain: ${TOOLCHAIN_TGTS} ==== //depot/projects/hammer/UPDATING#86 (text+ko) ==== @@ -21,6 +21,25 @@ developers choose to disable these features on build machines to maximize performance. +20051202: + Scripts in the local_startup directories (as defined in + /etc/defaults/rc.conf) that have the new rc.d semantics will + now be run as part of the base system rcorder. If there are + errors or problems with one of these local scripts, it could + cause boot problems. If you encounter such problems, boot in + single user mode, remove that script from the */rc.d directory. + Please report the problem to the port's maintainer, and the + freebsd-ports@freebsd.org mailing list. + +20051129: + The nodev mount option was deprecated in RELENG_6 (where it + was a no-op), and is now unsupported. If you have nodev or dev listed + in /etc/fstab, remove it, otherwise it will result in a mount error. + +20051129: + ABI between ipfw(4) and ipfw(8) has been changed. You need + to rebuild ipfw(8) when rebuilding kernel. + 20051029: /etc/rc.d/ppp-user has been renamed to /etc/rc.d/ppp. Its /etc/rc.conf.d configuration file has been `ppp' from @@ -113,7 +132,8 @@ 20050227: The on-disk format of LC_CTYPE files was changed to be machine independent. Please make sure NOT to use NO_CLEAN buildworld - when crossing this point. + when crossing this point. Crossing this point also requires + recompile or reinstall of all locale depended packages. 20050225: The ifi_epoch member of struct if_data has been changed to @@ -376,7 +396,8 @@ [8] In order to have a kernel that can run the 4.x binaries needed to do an installworld, you must include the COMPAT_FREEBSD4 option in your kernel. Failure to do so may leave you with a system - that is hard to boot to recover. + that is hard to boot to recover. A similar kernel option COMPAT_FREEBSD5 + is required to run the 5.x binaries on more recent kernels. Make sure that you merge any new devices from GENERIC since the last time you updated your kernel config file. @@ -424,4 +445,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.423 2005/10/29 05:27:32 yar Exp $ +$FreeBSD: src/UPDATING,v 1.427 2005/12/06 10:39:14 glebius Exp $ ==== //depot/projects/hammer/bin/sh/builtins.def#5 (text+ko) ==== @@ -32,7 +32,7 @@ # SUCH DAMAGE. # # @(#)builtins.def 8.4 (Berkeley) 5/4/95 -# $FreeBSD: src/bin/sh/builtins.def,v 1.15 2005/01/10 08:39:25 imp Exp $ +# $FreeBSD: src/bin/sh/builtins.def,v 1.18 2005/12/04 20:01:48 stefanf Exp $ # # This file lists all the builtin commands. The first column is the name @@ -47,12 +47,12 @@ # NOTE: bltincmd must come first! bltincmd builtin -commandcmd command -#alloccmd alloc +aliascmd alias bgcmd -j bg +bindcmd bind breakcmd break continue -#catfcmd catf cdcmd cd chdir +commandcmd command dotcmd . echocmd echo evalcmd eval @@ -62,15 +62,13 @@ exportcmd export readonly #exprcmd expr falsecmd false -histcmd -h fc fgcmd -j fg getoptscmd getopts hashcmd hash +histcmd -h fc jobidcmd jobid jobscmd jobs -#linecmd line localcmd local -#nlechocmd nlecho #printfcmd printf pwdcmd pwd readcmd read @@ -78,16 +76,14 @@ setcmd set setvarcmd setvar shiftcmd shift +testcmd test [ +timescmd times trapcmd trap truecmd : true typecmd type +ulimitcmd ulimit umaskcmd umask unaliascmd unalias unsetcmd unset waitcmd wait -#foocmd foo -aliascmd alias -ulimitcmd ulimit -testcmd test [ -bindcmd bind wordexpcmd wordexp ==== //depot/projects/hammer/bin/sh/eval.c#11 (text+ko) ==== @@ -36,12 +36,13 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.48 2005/10/29 07:19:11 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.49 2005/12/04 18:44:21 stefanf Exp $"); #include <paths.h> #include <signal.h> #include <stdlib.h> #include <unistd.h> +#include <sys/resource.h> #include <sys/wait.h> /* For WIFSIGNALED(status) */ #include <errno.h> @@ -1078,3 +1079,28 @@ } return 0; } + + +int +timescmd(int argc __unused, char **argv __unused) +{ + struct rusage ru; + long shumins, shsmins, chumins, chsmins; + double shusecs, shssecs, chusecs, chssecs; + + if (getrusage(RUSAGE_SELF, &ru) < 0) + return 1; + shumins = ru.ru_utime.tv_sec / 60; + shusecs = ru.ru_utime.tv_sec % 60 + ru.ru_utime.tv_usec / 1000000.; + shsmins = ru.ru_stime.tv_sec / 60; + shssecs = ru.ru_stime.tv_sec % 60 + ru.ru_stime.tv_usec / 1000000.; + if (getrusage(RUSAGE_CHILDREN, &ru) < 0) + return 1; + chumins = ru.ru_utime.tv_sec / 60; + chusecs = ru.ru_utime.tv_sec % 60 + ru.ru_utime.tv_usec / 1000000.; + chsmins = ru.ru_stime.tv_sec / 60; + chssecs = ru.ru_stime.tv_sec % 60 + ru.ru_stime.tv_usec / 1000000.; + out1fmt("%ldm%.3fs %ldm%.3fs\n%ldm%.3fs %ldm%.3fs\n", shumins, + shusecs, shsmins, shssecs, chumins, chusecs, chsmins, chssecs); + return 0; +} ==== //depot/projects/hammer/bin/sh/eval.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)eval.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/eval.h,v 1.10 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/eval.h,v 1.11 2005/12/04 18:44:21 stefanf Exp $ */ extern char *commandname; /* currently executing command */ @@ -56,6 +56,7 @@ int falsecmd(int, char **); int truecmd(int, char **); int execcmd(int, char **); +int timescmd(int, char **); int commandcmd(int, char **); /* in_function returns nonzero if we are currently evaluating a function */ ==== //depot/projects/hammer/bin/sh/sh.1#23 (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.114 2005/11/17 12:15:23 ru Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.115 2005/12/04 18:44:21 stefanf Exp $ .\" -.Dd October 29, 2005 +.Dd December 4, 2005 .Dt SH 1 .Os .Sh NAME @@ -1952,6 +1952,11 @@ the value of $2 to the value of $3, and so on, decreasing the value of $# by one. If there are zero positional parameters, shifting does not do anything. +.It Ic times +Print the amount of time spent executing the shell and its children. +The first output line shows the user and system times for the shell +itself, the second one contains the user and system times for the +children. .It Ic trap Oo Ar action Oc Ar signal ... Cause the shell to parse and execute .Ar action ==== //depot/projects/hammer/etc/rc#17 (text+ko) ==== @@ -25,7 +25,7 @@ # SUCH DAMAGE. # # @(#)rc 5.27 (Berkeley) 6/5/91 -# $FreeBSD: src/etc/rc,v 1.336 2005/04/29 23:02:56 brooks Exp $ +# $FreeBSD: src/etc/rc,v 1.337 2005/12/02 20:06:07 dougb Exp $ # # System startup script run by init on autoboot @@ -53,7 +53,7 @@ . /etc/rc.subr # Note: the system configuration files are loaded as part of -# the RCNG system (rc.d/rcconf.sh). Do not load them here as it may +# the rc.d system (rc.d/rcconf.sh). Do not load them here as it may # interfere with diskless booting. # if [ "$1" = autoboot ]; then @@ -72,10 +72,42 @@ 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 +# we can do a second pass that includes $local_startup directories +# files=`rcorder ${skip} /etc/rc.d/* 2>/dev/null` for _rc_elem in ${files}; do run_rc_script ${_rc_elem} ${_boot} + + case "$_rc_elem" in + */mountcritremote) break ;; + esac +done + +unset files local_rc + +# Now that disks are mounted, for each dir in $local_startup +# search for init scripts that use the new rc.d semantics. +# +case ${local_startup} in +[Nn][Oo] | '') ;; +*) find_local_scripts_new ;; +esac + +files=`rcorder ${skip} /etc/rc.d/* ${local_rc} 2>/dev/null` +_skip_early=1 +for _rc_elem in ${files}; do + case "$_skip_early" in + 1) case "$_rc_elem" in + */mountcritremote) _skip_early=0 ;; + esac + continue + ;; + esac + + run_rc_script ${_rc_elem} ${_boot} done echo '' ==== //depot/projects/hammer/etc/rc.d/NETWORKING#10 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: NETWORKING,v 1.2 2002/03/22 04:33:57 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.10 2005/10/28 16:07:52 yar Exp $ +# $FreeBSD: src/etc/rc.d/NETWORKING,v 1.11 2005/12/03 01:33:06 brooks Exp $ # # PROVIDE: NETWORKING NETWORK -# REQUIRE: dhclient netif routing network_ipv6 isdnd ppp +# REQUIRE: netif routing network_ipv6 isdnd ppp # REQUIRE: routed mrouted route6d mroute6d # This is a dummy dependency, for services which require networking ==== //depot/projects/hammer/etc/rc.d/localpkg#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/localpkg,v 1.6 2005/09/27 02:05:55 brooks Exp $ +# $FreeBSD: src/etc/rc.d/localpkg,v 1.7 2005/12/02 20:06:07 dougb Exp $ # # PROVIDE: localpkg @@ -23,29 +23,16 @@ ;; *) echo -n 'Local package initialization:' - slist="" - if [ -z "${script_name_sep}" ]; then - script_name_sep=" " - fi - for dir in ${local_startup}; do - if [ -d "${dir}" ]; then - for script in ${dir}/*.sh; do - slist="${slist}${script_name_sep}${script}" - done - fi - done - script_save_sep="$IFS" - IFS="${script_name_sep}" - for script in ${slist}; do + find_local_scripts_old + for script in ${zlist} ${slist}; do if [ -x "${script}" ]; then (set -T trap 'exit 1' 2 ${script} start) elif [ -f "${script}" -o -L "${script}" ]; then - echo -n " (skipping ${script##*/}, not executable)" + echo -n " (skipping ${script}, not executable)" fi done - IFS="${script_save_sep}" echo '.' ;; esac @@ -53,33 +40,19 @@ pkg_stop() { - # For each dir in $local_startup, search for init scripts matching *.sh case ${local_startup} in [Nn][Oo] | '') ;; *) echo -n 'Shutting down daemon processes:' - slist="" - if [ -z "${script_name_sep}" ]; then - script_name_sep=" " - fi - for dir in ${local_startup}; do - if [ -d "${dir}" ]; then - for script in ${dir}/*.sh; do - slist="${slist}${script_name_sep}${script}" - done - fi - done - script_save_sep="$IFS" - IFS="${script_name_sep}" - for script in `reverse_list ${slist}`; do + find_local_scripts_old + for script in `reverse_list ${slist} ${zlist}`; do if [ -x "${script}" ]; then (set -T trap 'exit 1' 2 ${script} stop) fi done - IFS="${script_save_sep}" echo '.' ;; esac ==== //depot/projects/hammer/etc/rc.d/root#9 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: root,v 1.2 2000/05/13 08:45:09 lukem Exp $ -# $FreeBSD: src/etc/rc.d/root,v 1.10 2004/10/07 13:55:26 mtm Exp $ +# $FreeBSD: src/etc/rc.d/root,v 1.11 2005/12/02 21:33:43 ru Exp $ # # PROVIDE: root @@ -23,7 +23,7 @@ [Nn][Oo] | '') ;; *) - if ! mount -u -o rw /; then + if ! mount -uw /; then echo 'Mounting root filesystem rw failed, startup aborted' /bin/kill -QUIT $$ fi ==== //depot/projects/hammer/etc/rc.d/tmp#5 (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/tmp,v 1.35 2004/11/09 10:03:17 keramida Exp $ +# $FreeBSD: src/etc/rc.d/tmp,v 1.37 2005/12/02 20:35:23 dougb Exp $ # # PROVIDE: tmp -# REQUIRE: mountcritlocal +# REQUIRE: mountcritremote . /etc/rc.subr ==== //depot/projects/hammer/etc/rc.shutdown#9 (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.shutdown,v 1.30 2004/12/14 14:36:35 rse Exp $ +# $FreeBSD: src/etc/rc.shutdown,v 1.31 2005/12/02 20:06:07 dougb Exp $ # # Site-specific closing actions for daemons run by init on shutdown, @@ -82,7 +82,13 @@ # rcorder_opts="-k shutdown" [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && rcorder_opts="$rcorder_opts -s nojail" -files=`rcorder ${rcorder_opts} /etc/rc.d/* 2>/dev/null` + +case ${local_startup} in +[Nn][Oo] | '') ;; +*) find_local_scripts_new ;; +esac + +files=`rcorder ${rcorder_opts} /etc/rc.d/* ${local_rc} 2>/dev/null` for _rc_elem in `reverse_list $files`; do debug "run_rc_script $_rc_elem faststop" ==== //depot/projects/hammer/etc/rc.subr#30 (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.43 2005/11/16 10:45:19 yar Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.46 2005/12/06 05:27:11 yar Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -598,12 +598,12 @@ start) if [ -z "$rc_fast" -a -n "$rc_pid" ]; then echo "${name} already running? (pid=$rc_pid)." - exit 1 + return 1 fi if [ ! -x ${_chroot}${command} ]; then info "run_rc_command: cannot run ($command)." - return 0 + return 1 fi # check for required variables, @@ -681,14 +681,14 @@ stop) if [ -z "$rc_pid" ]; then - [ -n "$rc_fast" ] && exit 0 + [ -n "$rc_fast" ] && return 0 if [ -n "$pidfile" ]; then echo \ "${name} not running? (check $pidfile)." else echo "${name} not running?" fi - exit 1 + return 1 fi # if the precmd failed and force @@ -733,7 +733,7 @@ else echo "${name} not running?" fi - exit 1 + return 1 fi echo "Reloading ${name} config files." >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512061847.jB6Ilu6D064803>