Date: Thu, 22 Oct 2009 07:33:28 GMT From: Alexander Motin <mav@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 169671 for review Message-ID: <200910220733.n9M7XS8j069805@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=169671 Change 169671 by mav@mav_mavbook on 2009/10/22 07:32:55 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile.inc1#8 integrate .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#16 integrate .. //depot/projects/scottl-camlock/src/bin/cat/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/bin/csh/iconv_stub.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/ls/ls.c#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/parser.c#6 integrate .. //depot/projects/scottl-camlock/src/bin/uuidgen/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/gcc/config/i386/i386.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/openpam/doc/man/pam.conf.5#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssh/sshd_config#4 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#10 integrate .. //depot/projects/scottl-camlock/src/etc/gettytab#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/bgfsck#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/cleartmp#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/faith#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/fsck#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/hostid#5 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/hostname#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ldconfig#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/motd#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/mountcritlocal#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/moused#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/netif#8 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/newsyslog#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/nfsclient#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/pf#7 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/savecore#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/stf#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.subr#7 integrate .. //depot/projects/scottl-camlock/src/games/number/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/games/number/number.c#2 integrate .. //depot/projects/scottl-camlock/src/kerberos5/lib/libgssapi_krb5/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/kerberos5/lib/libgssapi_spnego/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/getcwd.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/include/namespace.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/include/un-namespace.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/C.msg#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/Symbol.map#9 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/intro.2#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/nanosleep.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libfetch/common.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/pthread.map#3 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_syscalls.c#3 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#6 integrate .. //depot/projects/scottl-camlock/src/release/doc/README#2 integrate .. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/errata/article.sgml#2 integrate .. //depot/projects/scottl-camlock/src/release/doc/share/mk/doc.relnotes.mk#2 integrate .. //depot/projects/scottl-camlock/src/release/doc/share/sgml/release.dsl#3 integrate .. //depot/projects/scottl-camlock/src/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/scottl-camlock/src/release/scripts/package-split.py#5 integrate .. //depot/projects/scottl-camlock/src/sbin/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/sbin/adjkerntz/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/atacontrol/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/atm/atmconfig/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/badsect/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/camcontrol/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ccdconfig/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/clri/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/comcontrol/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/conscontrol/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/dhclient/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/dhclient/bpf.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/dhclient/dhcpd.h#2 integrate .. //depot/projects/scottl-camlock/src/sbin/dhclient/packet.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/dmesg/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/dump/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/dumpfs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/dumpfs/dumpfs.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/dumpon/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/part/gpart.8#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ggate/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/sbin/growfs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/gvinum/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/af_nd6.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifieee80211.c#8 integrate .. //depot/projects/scottl-camlock/src/sbin/init/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ipf/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/sbin/iscontrol/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/kldunload/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ldconfig/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/md5/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mdconfig/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mdmfs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mksnap_ffs/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/mount/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_autofs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_cd9660/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_ext2fs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_msdosfs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_nullfs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_reiserfs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_unionfs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/newfs_msdos/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/nfsiod/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/pfctl/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/rcorder/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/reboot/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/recoverdisk/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/routed/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/savecore/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/sconfig/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/shutdown/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/spppcontrol/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/swapon/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/sysctl/sysctl.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/tunefs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/tunefs/tunefs.8#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#13 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/hifn.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/ichwd.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/lindev.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/malo.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/sbp_targ.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/targ.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/urtw.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/BUS_BIND_INTR.9#1 branch .. //depot/projects/scottl-camlock/src/share/man/man9/BUS_DESCRIBE_INTR.9#1 branch .. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#11 integrate .. //depot/projects/scottl-camlock/src/share/misc/bsd-family-tree#5 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#7 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/asia#8 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/australasia#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_wakecode.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_wakeup.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/intr_machdep.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/nexus.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#35 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#28 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/atomic.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/elf.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/intr_machdep.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/HL200#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/elf.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/zfsboot/zfsboot.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#40 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#106 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_low.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios_alloc.c#3 delete .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#37 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#49 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#25 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.i386#25 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options#34 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/changes.txt#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adfile.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adisasm.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/adwalk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmextern.c#1 branch .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/dmtable.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/common/getopt.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslload.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbcmds.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbinput.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dswload.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evregion.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acapps.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acdebug.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acdisasm.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acglobal.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/aclocal.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpixf.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utglobal.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/x86emu/x86emu_util.c#3 delete .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_i810.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#70 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#24 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aic7xxx/aicasm/aicasm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbd.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bce.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bce/if_bcereg.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpms/dpms.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/drm_pciids.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/i915_drv.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/drm/mach64_state.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gem_pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_mod.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips_disk.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt.h#24 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge_var.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/vga_pci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/lpt.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ppbus/pcfclock.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_ixp4xx.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_mbus.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehcireg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci_atmelarm.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohcireg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci_pci.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhcireg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdce.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uch341.c#2 delete .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uchcom.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#31 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_rum.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_uath.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_upgt.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_ural.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtw.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtwreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/wlan/if_zyd.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clport.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clstate.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clsubs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_subr.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/concat/g_concat.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/geom/label/g_label.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/shsec/g_shsec.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/stripe/g_stripe.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/geom/uzip/g_uzip.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#27 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#26 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/intr_machdep.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/nexus.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#36 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/atomic.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/elf.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/intr_machdep.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/asm.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/elf.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/bus_if.m#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/imgact_elf.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/init_main.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_intr.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_thr.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sched_ule.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/kern/stack_protector.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_trap.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/sys_process.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_ttydisc.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/elf.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/pmap.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#38 integrate .. //depot/projects/scottl-camlock/src/sys/modules/dpms/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/nfsclient/Makefile#10 integrate .. //depot/projects/scottl-camlock/src/sys/modules/pf/Makefile#11 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ubser/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sys/modules/usb/Makefile#11 integrate .. //depot/projects/scottl-camlock/src/sys/modules/usb/uch341/Makefile#2 delete .. //depot/projects/scottl-camlock/src/sys/modules/usb/ucom/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/vesa/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/modules/x86bios/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sys/net/flowtable.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_enc.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_gif.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/net/pfil.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/pfil.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_hwmp.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_mesh.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_mesh.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_output.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/net80211/ieee80211_proto.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_bridge.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/if_ether.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fastfwd.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_icmp.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_output.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_var.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_pfil.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_bsd_addr.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_os_bsd.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_pcb.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/icmp6.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_ifattach.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_forward.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_input.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_output.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/ip6_var.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_kdtrace.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#21 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/platform_chrp.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/swtch.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/trap_subr.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/pmap.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/elf.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/pmap.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/mmu_if.m#10 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/pmap_dispatch.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/uio_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#25 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/elf.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/include/elf.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/pmap.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/bus.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/sys/interrupt.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/kernel.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/sys/signalvar.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/ttyqueue.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/teken/sequences#3 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/teken/teken_subr.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/tools/fw_stub.awk#4 integrate .. //depot/projects/scottl-camlock/src/sys/vm/pmap.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/vm/swap_pager.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_extern.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_glue.c#17 integrate .. //depot/projects/scottl-camlock/src/tools/regression/fstest/tests/rename/21.t#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/lib/libutil/test-flopen.c#3 integrate .. //depot/projects/scottl-camlock/src/tools/regression/sigqueue/sigqtest1/sigqtest1.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/sigqueue/sigqtest2/sigqtest2.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/tools/netrate/netsend/netsend.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/job.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/main.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/route.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/keyboard.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/main.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/touch/touch.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/acpi/iasl/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/jail/jail.8#8 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ntp/doc/ntpd.8#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/tcpip.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/tzsetup/tzsetup.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/tzsetup/tzsetup.c#4 integrate Differences ... ==== //depot/projects/scottl-camlock/src/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.629 2009/09/10 07:37:36 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.631 2009/10/21 19:39:34 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -929,6 +929,10 @@ _mklocale= usr.bin/mklocale .endif +.if ${BOOTSTRAPPING} < 900002 +_sed= usr.bin/sed +.endif + .if ${BOOTSTRAPPING} < 700018 _gensnmptree= usr.sbin/bsnmpd/gensnmptree .endif @@ -954,6 +958,7 @@ usr.bin/makewhatis \ ${_mklocale} \ usr.bin/rpcgen \ + ${_sed} \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ @@ -1033,7 +1038,6 @@ .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ - usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ @@ -1122,7 +1126,7 @@ _secure_lib_libssh= secure/lib/libssh secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L .if ${MK_KERBEROS} != "no" -kerberos5/lib/libgssapi_krb5__L: kerberos5/lib/libkrb5__L \ +kerberos5/lib/libgssapi_krb5__L: lib/libgssapi__L kerberos5/lib/libkrb5__L \ kerberos5/lib/libhx509__L kerberos5/lib/libasn1__L lib/libcom_err__L \ lib/libmd__L kerberos5/lib/libroken__L secure/lib/libcrypto__L \ lib/libcrypt__L ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.209 2009/09/10 21:42:00 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.210 2009/10/12 21:10:28 markm Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -503,6 +503,8 @@ OLD_FILES+=usr/include/dev/usb/usbcdc.h OLD_FILES+=usr/include/dev/usb/usbdivar.h OLD_FILES+=usr/include/dev/usb/uxb360gp_rdesc.h +OLD_FILES+=usr/sbin/usbdevs +OLD_FILES+=usr/share/man/man8/usbdevs.8.gz # 20090203: removal of pccard header files OLD_FILES+=usr/include/pccard/cardinfo.h OLD_FILES+=usr/include/pccard/cis.h ==== //depot/projects/scottl-camlock/src/bin/cat/Makefile#3 (text+ko) ==== @@ -1,7 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/cat/Makefile,v 1.8 2009/03/16 12:16:17 des Exp $ +# $FreeBSD: src/bin/cat/Makefile,v 1.9 2009/10/15 18:17:29 ru Exp $ PROG= cat -WARNS?= 6 .include <bsd.prog.mk> ==== //depot/projects/scottl-camlock/src/bin/csh/iconv_stub.c#2 (text) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/bin/csh/iconv_stub.c,v 1.1 2006/02/19 06:40:29 ume Exp $ + * $FreeBSD: src/bin/csh/iconv_stub.c,v 1.2 2009/10/17 15:53:15 ume Exp $ */ #include <dlfcn.h> @@ -61,9 +61,20 @@ if (iconvlib == NULL) return (iconv_t)-1; iconv_open = (iconv_open_t *)dlfunc(iconvlib, ICONV_OPEN); + if (iconv_open == NULL) + goto dlfunc_err; dl_iconv = (dl_iconv_t *)dlfunc(iconvlib, ICONV_ENGINE); + if (dl_iconv == NULL) + goto dlfunc_err; dl_iconv_close = (dl_iconv_close_t *)dlfunc(iconvlib, ICONV_CLOSE); + if (dl_iconv_close == NULL) + goto dlfunc_err; } return iconv_open(tocode, fromcode); + +dlfunc_err: + dlclose(iconvlib); + iconvlib = NULL; + return (iconv_t)-1; } ==== //depot/projects/scottl-camlock/src/bin/ls/ls.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.86 2008/04/04 03:57:46 grog Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.87 2009/10/13 21:51:50 jilles Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -399,7 +399,7 @@ * If not -F, -d or -l options, follow any symbolic links listed on * the command line. */ - if (!f_longform && !f_listdir && !f_type) + if (!f_longform && !f_listdir && (!f_type || f_slash)) fts_options |= FTS_COMFOLLOW; /* ==== //depot/projects/scottl-camlock/src/bin/sh/parser.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.64 2009/10/01 21:40:08 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.65 2009/10/16 16:17:57 jilles Exp $"); #include <stdlib.h> #include <unistd.h> @@ -1308,11 +1308,16 @@ struct jmploc *const savehandler = handler; int savelen; int saveprompt; + const int bq_startlinno = plinno; if (setjmp(jmploc.loc)) { if (str) ckfree(str); handler = savehandler; + if (exception == EXERROR) { + startlinno = bq_startlinno; + synerror("Error in command substitution"); + } longjmp(handler->loc, 1); } INTOFF; ==== //depot/projects/scottl-camlock/src/bin/uuidgen/Makefile#2 (text+ko) ==== @@ -1,6 +1,5 @@ -# $FreeBSD: src/bin/uuidgen/Makefile,v 1.4 2008/03/13 17:38:06 obrien Exp $ +# $FreeBSD: src/bin/uuidgen/Makefile,v 1.5 2009/10/15 18:17:29 ru Exp $ PROG= uuidgen -WARNS?= 6 .include <bsd.prog.mk> ==== //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 (text+ko) ==== @@ -1790,11 +1790,14 @@ /* We don't support those properties on FreeBSD. */ switch (prop) { + case ZFS_PROP_DEVICES: + case ZFS_PROP_ZONED: case ZFS_PROP_SHAREISCSI: - case ZFS_PROP_DEVICES: - case ZFS_PROP_ACLMODE: - case ZFS_PROP_ACLINHERIT: case ZFS_PROP_ISCSIOPTIONS: + case ZFS_PROP_XATTR: + case ZFS_PROP_VSCAN: + case ZFS_PROP_NBMAND: + case ZFS_PROP_SHARESMB: (void) snprintf(errbuf, sizeof (errbuf), "property '%s' not supported on FreeBSD", propname); ret = zfs_error(hdl, EZFS_PERM, errbuf); ==== //depot/projects/scottl-camlock/src/contrib/gcc/config/i386/i386.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.25 2007/08/14 03:04:42 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/i386.c,v 1.26 2009/10/21 19:26:12 jhb Exp $ */ #include "config.h" #include "system.h" @@ -1614,7 +1614,7 @@ "-mtune=generic instead as appropriate."); if (!ix86_arch_string) - ix86_arch_string = TARGET_64BIT ? "x86-64" : "i386"; + ix86_arch_string = TARGET_64BIT ? "x86-64" : "i486"; if (!strcmp (ix86_arch_string, "generic")) error ("generic CPU can be used only for -mtune= switch"); if (!strncmp (ix86_arch_string, "generic", 7)) ==== //depot/projects/scottl-camlock/src/contrib/openpam/doc/man/pam.conf.5#3 (text) ==== @@ -109,7 +109,7 @@ .It Cm requisite If this module succeeds, the result of the chain will be success unless a later module fails. -If it module fails, the chain is broken and the result is failure. +If the module fails, the chain is broken and the result is failure. .It Cm sufficient If this module succeeds, the chain is broken and the result is success. ==== //depot/projects/scottl-camlock/src/crypto/openssh/sshd_config#4 (text+ko) ==== @@ -1,5 +1,5 @@ # $OpenBSD: sshd_config,v 1.80 2008/07/02 02:24:18 djm Exp $ -# $FreeBSD: src/crypto/openssh/sshd_config,v 1.50 2009/10/01 17:12:52 des Exp $ +# $FreeBSD: src/crypto/openssh/sshd_config,v 1.51 2009/10/11 14:27:33 des Exp $ # This is the sshd server system-wide configuration file. See # sshd_config(5) for more information. @@ -17,7 +17,6 @@ #VersionAddendum FreeBSD-20091001 #Port 22 -#Protocol 2 #AddressFamily any #ListenAddress 0.0.0.0 #ListenAddress :: ==== //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#10 (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.362 2009/09/29 16:49:10 dougb Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.363 2009/10/21 09:43:22 brueffer Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -600,6 +600,7 @@ harvest_p_to_p="YES" # Entropy device harvests point-to-point randomness dmesg_enable="YES" # Save dmesg(8) to /var/run/dmesg.boot watchdogd_enable="NO" # Start the software watchdog daemon +watchdogd_flags="" # Flags to watchdogd (if enabled) devfs_rulesets="/etc/defaults/devfs.rules /etc/devfs.rules" # Files containing # devfs(8) rules. devfs_system_ruleset="" # The name (NOT number) of a ruleset to apply to /dev ==== //depot/projects/scottl-camlock/src/etc/gettytab#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/gettytab,v 1.24 2006/04/11 09:54:23 des Exp $ +# $FreeBSD: src/etc/gettytab,v 1.26 2009/10/19 11:10:44 ed Exp $ # from: @(#)gettytab 5.14 (Berkeley) 3/27/91 # # Most of the table entries here are just copies of the old getty table, @@ -162,7 +162,7 @@ :fd@:nd@:cd@:rw:sp#9600: P|Pc|Pc console:\ - :ht:np:sp#115200: + :ht:np:sp#9600: # # Wierdo special case for fast crt's with hardcopy devices ==== //depot/projects/scottl-camlock/src/etc/rc.d/bgfsck#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/bgfsck,v 1.9 2008/06/23 04:46:54 mtm Exp $ +# $FreeBSD: src/etc/rc.d/bgfsck,v 1.10 2009/10/10 22:17:03 dougb Exp $ # # PROVIDE: bgfsck @@ -31,7 +31,7 @@ bgfsck_msg="${bgfsck_msg} in ${background_fsck_delay} seconds" fi if [ -z "${rc_force}" ]; then - [ -z "${rc_quiet}" ] && echo "${bgfsck_msg}." + check_startmsgs && echo "${bgfsck_msg}." fi (sleep ${background_fsck_delay}; nice -4 fsck -B -p) 2>&1 | \ ==== //depot/projects/scottl-camlock/src/etc/rc.d/cleartmp#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleartmp,v 1.19 2008/06/23 04:42:58 mtm Exp $ +# $FreeBSD: src/etc/rc.d/cleartmp,v 1.20 2009/10/10 22:17:03 dougb Exp $ # # PROVIDE: cleartmp @@ -25,7 +25,7 @@ ${tmp}/.ICE-unix ${tmp}/.font-unix" if checkyesno ${rcvar1}; then - [ -z "${rc_quiet}" ] && echo "Clearing ${tmp}." + check_startmsgs && echo "Clearing ${tmp}." # This is not needed for mfs, but doesn't hurt anything. # Things to note: @@ -44,7 +44,7 @@ elif checkyesno clear_tmp_X; then # Remove X lock files, since they will prevent you from # restarting X. Remove other X related directories. - [ -z "${rc_quiet}" ] && echo "Clearing ${tmp} (X related)." + check_startmsgs && echo "Clearing ${tmp} (X related)." rm -rf ${tmp}/.X[0-9]-lock ${x11_socket_dirs} fi if checkyesno clear_tmp_X; then ==== //depot/projects/scottl-camlock/src/etc/rc.d/faith#3 (text+ko) ==== @@ -1,9 +1,9 @@ #!/bin/sh -# $FreeBSD: src/etc/rc.d/faith,v 1.3 2009/10/02 06:19:34 hrs Exp $ +# $FreeBSD: src/etc/rc.d/faith,v 1.5 2009/10/17 21:09:15 dougb Exp $ # # PROVIDE: faith -# REQUIRE: netif routing +# REQUIRE: netif # KEYWORD: nojail . /etc/rc.subr @@ -39,9 +39,7 @@ route change -inet6 ${prefix} -prefixlen ${prefixlen} \ -ifp faith0 done - if [ -z "${rc_quiet}" ]; then - ifconfig faith0 - fi + check_startmsgs && ifconfig faith0 ;; esac } ==== //depot/projects/scottl-camlock/src/etc/rc.d/fsck#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/fsck,v 1.14 2009/06/10 19:03:23 avg Exp $ +# $FreeBSD: src/etc/rc.d/fsck,v 1.15 2009/10/10 22:17:03 dougb Exp $ # # PROVIDE: fsck @@ -23,7 +23,7 @@ # During fsck ignore SIGQUIT trap : 3 - [ -z "${rc_quiet}" ] && echo "Starting file system checks:" + check_startmsgs && echo "Starting file system checks:" if checkyesno background_fsck; then fsck -F -p else ==== //depot/projects/scottl-camlock/src/etc/rc.d/hostid#5 (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.11 2009/07/29 05:23:52 pjd Exp $ +# $FreeBSD: src/etc/rc.d/hostid,v 1.12 2009/10/10 22:17:03 dougb Exp $ # # PROVIDE: hostid @@ -49,9 +49,9 @@ # Set both kern.hostuuid and kern.hostid. # - [ -z "${rc_quiet}" ] && echo "Setting hostuuid: ${uuid}." + check_startmsgs && echo "Setting hostuuid: ${uuid}." ${SYSCTL_W} kern.hostuuid="${uuid}" >/dev/null - [ -z "${rc_quiet}" ] && echo "Setting hostid: ${id}." + check_startmsgs && echo "Setting hostid: ${id}." ${SYSCTL_W} kern.hostid=${id} >/dev/null } ==== //depot/projects/scottl-camlock/src/etc/rc.d/hostname#4 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/hostname,v 1.13 2008/06/23 04:46:54 mtm Exp $ +# $FreeBSD: src/etc/rc.d/hostname,v 1.14 2009/10/10 22:17:03 dougb Exp $ # # PROVIDE: hostname @@ -72,8 +72,9 @@ # All right, it is safe to invoke hostname(1) now. # - [ -z "${rc_quiet}" ] && echo "Setting hostname: ${hostname}." + check_startmsgs && echo -n "Setting hostname: ${hostname}" /bin/hostname "${hostname}" + check_startmsgs && echo '.' } load_rc_config $name ==== //depot/projects/scottl-camlock/src/etc/rc.d/ldconfig#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.20 2008/06/23 04:46:54 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.21 2009/10/10 22:17:03 dougb Exp $ # # PROVIDE: ldconfig @@ -36,7 +36,7 @@ _LDC="${_LDC} ${i}" fi done - [ -z "${rc_quiet}" ] && echo 'ELF ldconfig path:' ${_LDC} + check_startmsgs && echo 'ELF ldconfig path:' ${_LDC} ${ldconfig} -elf ${_ins} ${_LDC} case `sysctl -n hw.machine_arch` in @@ -55,7 +55,7 @@ _LDC="${_LDC} ${i}" fi done - [ -z "${rc_quiet}" ] && + check_startmsgs && echo '32-bit compatibility ldconfig path:' ${_LDC} ${ldconfig} -32 -m ${_ins} ${_LDC} ;; @@ -72,8 +72,7 @@ _LDC="${_LDC} ${i}" fi done - [ -z "${rc_quiet}" ] && - echo 'a.out ldconfig path:' ${_LDC} + check_startmsgs && echo 'a.out ldconfig path:' ${_LDC} ${ldconfig} -aout ${_ins} ${_LDC} ;; esac ==== //depot/projects/scottl-camlock/src/etc/rc.d/motd#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/motd,v 1.11 2008/06/23 04:46:54 mtm Exp $ +# $FreeBSD: src/etc/rc.d/motd,v 1.12 2009/10/10 22:17:03 dougb Exp $ # # PROVIDE: motd @@ -22,7 +22,7 @@ # Must be done *before* interactive logins are possible # to prevent possible race conditions. # - [ -z "${rc_quiet}" ] && echo -n 'Updating motd:' + check_startmsgs && echo -n 'Updating motd:' if [ ! -f /etc/motd ]; then install -c -o root -g wheel -m ${PERMS} /dev/null /etc/motd fi @@ -42,7 +42,7 @@ } rm -f $T - [ -z "${rc_quiet}" ] && echo . + check_startmsgs && echo '.' } load_rc_config $name ==== //depot/projects/scottl-camlock/src/etc/rc.d/mountcritlocal#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.17 2008/07/05 15:19:58 mtm Exp $ +# $FreeBSD: src/etc/rc.d/mountcritlocal,v 1.18 2009/10/10 22:17:03 dougb Exp $ # # PROVIDE: mountcritlocal @@ -28,7 +28,7 @@ esac # Mount everything except nfs filesystems. - [ -z "${rc_quiet}" ] && echo -n 'Mounting local file systems:' + check_startmsgs && echo -n 'Mounting local file systems:' mount_excludes='no' for i in ${netfs_types}; do fstype=${i%:*} @@ -37,7 +37,7 @@ mount_excludes=${mount_excludes%,} mount -a -t ${mount_excludes} err=$? - [ -z "${rc_quiet}" ] && echo '.' + check_startmsgs && echo '.' case ${err} in 0) ==== //depot/projects/scottl-camlock/src/etc/rc.d/moused#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/moused,v 1.15 2009/05/30 21:51:38 dougb Exp $ +# $FreeBSD: src/etc/rc.d/moused,v 1.16 2009/10/10 22:17:03 dougb Exp $ # # PROVIDE: moused @@ -51,8 +51,9 @@ mytype="$moused_type" fi - [ -z "${rc_quiet}" ] && echo -n "Starting ${ms} moused." + check_startmsgs && echo -n "Starting ${ms} moused" /usr/sbin/moused ${myflags} -p ${myport} -t ${mytype} ${pidarg} + check_startmsgs && echo '.' mousechar_arg= case ${mousechar_start} in ==== //depot/projects/scottl-camlock/src/etc/rc.d/netif#8 (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.34 2009/09/26 18:59:00 hrs Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.35 2009/10/10 22:17:03 dougb Exp $ # # PROVIDE: netif @@ -143,7 +143,7 @@ ;; esac echo "${_str} Network:${_ok}." - if [ -z "${rc_quiet}" ]; then + if check_startmsgs; then for ifn in ${_ok}; do /sbin/ifconfig ${ifn} done ==== //depot/projects/scottl-camlock/src/etc/rc.d/newsyslog#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/newsyslog,v 1.7 2008/06/23 04:46:54 mtm Exp $ +# $FreeBSD: src/etc/rc.d/newsyslog,v 1.8 2009/10/10 22:17:03 dougb Exp $ # # PROVIDE: newsyslog @@ -17,9 +17,9 @@ newsyslog_start() { - [ -z "${rc_quiet}" ] && echo -n "Creating and/or trimming log files:" + check_startmsgs && echo -n 'Creating and/or trimming log files' ${command} ${rc_flags} - [ -z "${rc_quiet}" ] && echo "." + check_startmsgs && echo '.' } load_rc_config $name ==== //depot/projects/scottl-camlock/src/etc/rc.d/nfsclient#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/nfsclient,v 1.7 2008/07/05 15:13:21 mtm Exp $ +# $FreeBSD: src/etc/rc.d/nfsclient,v 1.8 2009/10/10 22:17:03 dougb Exp $ # # PROVIDE: nfsclient @@ -22,7 +22,8 @@ # if [ -n "${nfs_access_cache}" ]; then - [ -z "${rc_quiet}" ] && echo "NFS access cache time=${nfs_access_cache}" + check_startmsgs && + echo "NFS access cache time=${nfs_access_cache}" if ! sysctl vfs.nfs.access_cache_timeout=${nfs_access_cache} >/dev/null; then warn "failed to set access cache timeout" fi ==== //depot/projects/scottl-camlock/src/etc/rc.d/pf#7 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/pf,v 1.19 2009/06/26 01:04:50 dougb Exp $ +# $FreeBSD: src/etc/rc.d/pf,v 1.20 2009/10/10 22:17:03 dougb Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200910220733.n9M7XS8j069805>