From owner-p4-projects@FreeBSD.ORG Tue Jun 29 22:53:42 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86BE81065673; Tue, 29 Jun 2010 22:53:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A8B6106564A for ; Tue, 29 Jun 2010 22:53:42 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 370E88FC14 for ; Tue, 29 Jun 2010 22:53:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o5TMrfuA095092 for ; Tue, 29 Jun 2010 22:53:41 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5TMrffP095090 for perforce@freebsd.org; Tue, 29 Jun 2010 22:53:41 GMT (envelope-from trasz@freebsd.org) Date: Tue, 29 Jun 2010 22:53:41 GMT Message-Id: <201006292253.o5TMrffP095090@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 180334 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jun 2010 22:53:42 -0000 http://p4web.freebsd.org/@@180334?ac=10 Change 180334 by trasz@trasz_victim on 2010/06/29 22:53:06 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/Makefile.inc1#12 integrate .. //depot/projects/soc2009/trasz_limits/Makefile.mips#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/binutils/binutils/doc/readelf.1#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/mtree/BSD.usr.dist#9 integrate .. //depot/projects/soc2009/trasz_limits/games/fortune/datfiles/fortunes-o.real#7 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh#2 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/Makefile#9 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/mips/sys/brk.S#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/mips/sys/sbrk.S#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/getgroups.2#3 integrate .. //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/rtld.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sbin/devd/devd.cc#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/devd/devd.hh#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/main.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/suj.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/geom/class/part/geom_part.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sbin/geom/core/geom.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sbin/geom/core/geom.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/geom/misc/subr.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/geom/misc/subr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/perfmon/perfmon.c#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man3/pthread_join.3#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/Makefile#19 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/aibs.4#1 branch .. //depot/projects/soc2009/trasz_limits/share/man/man9/style.9#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/exception.S#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/machdep.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/ia32/ia32_exception.S#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/asmacros.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/cam_xpt.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_proto.h#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscall.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_syscalls.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_sysent.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/syscalls.master#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_signal.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/x86bios/x86bios.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/x86bios/x86bios.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#29 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.amd64#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.i386#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/ldscript.mips.n32#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/acpi_support/atk0110.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_hpet.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bwi/if_bwi.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_igb.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/fb/fbreg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/fb/vesa.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt_raid.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/usb/uaudio.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/usb/uaudioreg.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ohci.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/uhci.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_rue.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/quirk/usb_quirk.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_transfer.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdevs#22 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_upgt.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/part/g_part.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/part/g_part.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/part/g_part_mbr.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/NOTES#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/apic_vector.s#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/atpic_vector.s#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/exception.s#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/machdep.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/support.s#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/vm_machdep.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/md_var.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/npx.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/pcb.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/isa/npx.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/init_sysent.c#12 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_acct.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_clock.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exec.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#20 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_module.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#34 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sdt.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sig.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_syscalls.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_tc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_thr.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_umtx.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/makesyscalls.sh#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_bus.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_devstat.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_fattime.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_lock.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_mchain.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_module.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_param.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_trap.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_unit.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_witness.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sys_generic.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sys_process.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sys_socket.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.c#11 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/systrace_args.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sysv_shm.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_mbuf.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_mbuf2.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_mqueue.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_syscalls.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_subr.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_vnops.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/atheros/ar71xxreg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/conf/XLRN32#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/include/asm.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/cpu.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/pte.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/setjmp.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/vm.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/vmparam.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/exception.S#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/machdep.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/pm_machdep.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/pmap.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/stack_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/trap.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/vm_machdep.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/acpi/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/acpi/aibs/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/mqueue/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_fw2.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_pcb.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/pc98/include/npx.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/pc98/pc98/machdep.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/nexus.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/pmap.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/asm.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/intr_machdep.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/openpicvar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/profile.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/atpic.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/ocpbus.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/opic.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/pci_ocp.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/cpcht.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/openpic_macio.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/intr_machdep.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/openpic.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/pic_if.m#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/diskmbr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/signalvar.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.h#11 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.mk#11 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/sysent.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/sysproto.h#12 edit .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_page.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_page.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/x86/isa/atrtc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/x86/isa/clock.c#4 integrate .. //depot/projects/soc2009/trasz_limits/tools/tools/netrate/tcpp/README#3 integrate .. //depot/projects/soc2009/trasz_limits/tools/tools/netrate/tcpp/parallelism.csh#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/netrate/tcpp/runit.pl#1 branch .. //depot/projects/soc2009/trasz_limits/usr.bin/locate/bigram/locate.bigram.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/locate/code/locate.code.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/lock/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/lock/lock.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/ministat/ministat.1#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/tcopy/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/tcopy/tcopy.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/tftp/tftp.c#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/Makefile#14 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/boot0cfg/boot0cfg.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/mptutil/mptutil.8#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/Makefile.inc#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-partmanager/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/detect-laptop.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/detect-nics.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/detect-vmware.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/disk-info.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/disk-list.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/disk-part.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/enable-net.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/list-components.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/list-config.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/list-mirrors.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/list-rsync-backups.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/list-tzones.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/query-langs.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/send-logs.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/setup-ssh-keys.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/sys-mem.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/test-live.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/test-netup.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/update-part-list.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/xkeyboard-layouts.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/xkeyboard-models.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/xkeyboard-variants.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-cleanup.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-disk.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-ftp.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-localize.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-mountdisk.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-mountoptical.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-networking.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-newfs.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-parse.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-runcommands.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-unmount.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-upgrade.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-users.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/parseconfig.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/startautoinstall.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/conf/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/conf/avail-langs#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/conf/exclude-from-upgrade#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/conf/licenses/bsd-en.txt#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/conf/licenses/intel-en.txt#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/conf/licenses/nvidia-en.txt#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/conf/pc-sysinstall.conf#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/doc/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/doc/help-disk-list#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/doc/help-disk-size#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/doc/help-index#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/doc/help-start-autoinstall#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/examples/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/examples/README#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/examples/pc-autoinstall.conf#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.fbsd-netinstall#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.geli#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.gmirror#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.netinstall#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.restore#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.rsync#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.upgrade#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/examples/pcinstall.cfg.zfs#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/pc-sysinstall/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.8#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/sysinstall/dist.c#6 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/sysinstall/install.c#6 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/sysinstall/sysinstall.8#5 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/Makefile.inc1#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.653 2010/06/16 16:52:35 raj Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.656 2010/06/24 17:53:25 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -30,9 +30,7 @@ .include -.if ${MACHINE_ARCH} == "mips" -MK_RESCUE=no # not yet -.endif +.include # We must do share/info early so that installation of info `dir' # entries works correctly. Do it first since it is less likely to @@ -167,7 +165,7 @@ .if ${MACHINE} == ${TARGET} && !defined(CROSS_BUILD_TESTING) OBJTREE= ${MAKEOBJDIRPREFIX} .else -OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET} +OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/tmp # /usr/games added for fortune which depend on strfile @@ -1110,10 +1108,10 @@ # all shared libraries for ELF. # _startup_libs= gnu/lib/csu -.if exists(${.CURDIR}/lib/csu/${MACHINE_ARCH}-elf) -_startup_libs+= lib/csu/${MACHINE_ARCH}-elf +.if exists(${.CURDIR}/lib/csu/${MACHINE_CPUARCH}-elf) +_startup_libs+= lib/csu/${MACHINE_CPUARCH}-elf .else -_startup_libs+= lib/csu/${MACHINE_ARCH} +_startup_libs+= lib/csu/${MACHINE_CPUARCH} .endif _startup_libs+= gnu/lib/libgcc _startup_libs+= lib/libc ==== //depot/projects/soc2009/trasz_limits/contrib/binutils/binutils/doc/readelf.1#2 (text+ko) ==== @@ -247,14 +247,6 @@ .PD Displays the contents of the file's unwind section, if it has one. Only the unwind sections for \s-1IA64\s0 \s-1ELF\s0 files are currently supported. -.IP "\fB\-u\fR" 4 -.IX Item "-u" -.PD 0 -.IP "\fB\-\-unwind\fR" 4 -.IX Item "--unwind" -.PD -Displays the contents of the file's unwind section, if it has one. Only -the unwind sections for \s-1IA64\s0 \s-1ELF\s0 files are currently supported. .IP "\fB\-d\fR" 4 .IX Item "-d" .PD 0 ==== //depot/projects/soc2009/trasz_limits/etc/mtree/BSD.usr.dist#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.345 2010/04/21 12:17:01 avg Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.347 2010/06/28 08:05:30 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -261,6 +261,8 @@ .. nwclient .. + pc-sysinstall + .. perfmon .. pf @@ -1226,6 +1228,20 @@ .. .. .. + pc-sysinstall + backend + .. + backend-partmanager + .. + backend-query + .. + conf + license + .. + .. + doc + .. + .. security .. sendmail ==== //depot/projects/soc2009/trasz_limits/games/fortune/datfiles/fortunes-o.real#7 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.36 2010/03/31 18:21:25 uqs Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.37 2010/06/26 07:02:31 dougb Exp $ % PLAYGIRL, Inc. Philadelphia, Pa. 19369 @@ -12433,6 +12433,39 @@ (chorus) -- Crosby, Stills, Nash, "Fair Game" % +Taken from actual police car videos: + +(15) Relax! The handcuffs are tight because they're new. They'll + stretch out after you wear them awhile. +(14) Take your hands off the car and I'll make your birth certificate + a worthless document. +(13) If you run you'll only go to jail tired. +(12) Can you run faster than 1200 feet per second? In case you didn't + know that's the average speed of a 9 mm bullet fired from my gun. +(11) So you don't know how fast you were going. I guess that means I + can write anything I want on the ticket, huh? +(10) Yes, sir, you can talk to the shift supervisor, but I don't think + it will help. Oh, did I mention that I AM the shift supervisor? +(9) Warning? You want a warning? OK, I'm warning you not to do that + again or I'll give you another ticket. +(8) The answer to this last question will determine whether you are + drunk or not. Is Mickey Mouse a cat or a dog? +% +Taken from actual police car videos: + +(7) Fair? You want me to be fair? Listen, fair is a place where you + go to ride on rides, eat cotton candy, and step in monkey poop. +(6) Yeah, we have a quota. Two more tickets and my wife gets a toaster + oven. +(5) No, sir, we don't have quotas anymore. We used to have quotas but + now we're allowed to write as many tickets as we want. +(4) Just how big were those two beers? +(3) In God we trust, all others we run through CPIC/NCIC. +(2) I'm glad to hear the Chief of Police is a good personal friend of + yours. At least you know someone who can post your bail. +(1) You didn't think we gave pretty women tickets? + You're right, we don't -- sign here. +% Taoism: Shit Happens. Confucianism: Confucius say, "Shit Happens". Buddhism: If shit happens, it isn't really shit. ==== //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh#2 (text+ko) ==== @@ -1,4 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh,v 1.2 2010/03/04 04:30:16 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/elf32btsmipn32_fbsd.sh,v 1.3 2010/06/25 05:07:42 jchandra Exp $ . ${srcdir}/emulparams/elf32btsmipn32.sh . ${srcdir}/emulparams/elf_fbsd.sh GENERATE_PIE_SCRIPT=yes +ALIGNMENT=8 ==== //depot/projects/soc2009/trasz_limits/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh#2 (text+ko) ==== @@ -1,4 +1,5 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh,v 1.2 2010/03/04 04:30:16 imp Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/ld/elf32ltsmipn32_fbsd.sh,v 1.3 2010/06/25 05:07:42 jchandra Exp $ . ${srcdir}/emulparams/elf32ltsmipn32.sh . ${srcdir}/emulparams/elf_fbsd.sh GENERATE_PIE_SCRIPT=yes +ALIGNMENT=8 ==== //depot/projects/soc2009/trasz_limits/lib/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.248 2010/06/09 19:57:20 rdivacky Exp $ +# $FreeBSD: src/lib/Makefile,v 1.249 2010/06/21 19:44:29 ed Exp $ .include @@ -138,7 +138,7 @@ _libbsnmp= libbsnmp .endif -.if ${MK_CLANG} != "no" +.if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT) _clang= clang .endif ==== //depot/projects/soc2009/trasz_limits/lib/libc/mips/sys/brk.S#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/mips/sys/brk.S,v 1.5 2010/06/16 12:55:14 jchandra Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/mips/sys/brk.S,v 1.6 2010/06/25 05:36:36 jchandra Exp $"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) @@ -47,7 +47,7 @@ .data _C_LABEL(minbrk): - .word _C_LABEL(_end) + PTR_WORD _C_LABEL(_end) .text LEAF(__sys_brk) ==== //depot/projects/soc2009/trasz_limits/lib/libc/mips/sys/sbrk.S#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/mips/sys/sbrk.S,v 1.4 2010/06/16 12:55:14 jchandra Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/mips/sys/sbrk.S,v 1.5 2010/06/25 05:36:36 jchandra Exp $"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) @@ -46,7 +46,7 @@ .data _C_LABEL(__curbrk): - .word _C_LABEL(_end) + PTR_WORD _C_LABEL(_end) .text LEAF(__sys_sbrk) ==== //depot/projects/soc2009/trasz_limits/lib/libc/sys/getgroups.2#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getgroups.2 8.2 (Berkeley) 4/16/94 -.\" $FreeBSD: src/lib/libc/sys/getgroups.2,v 1.14 2009/06/19 15:58:24 brooks Exp $ +.\" $FreeBSD: src/lib/libc/sys/getgroups.2,v 1.15 2010/06/26 21:44:05 pjd Exp $ .\" .Dd March 5, 1999 .Dt GETGROUPS 2 @@ -37,7 +37,7 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h +.In sys/param.h .In unistd.h .Ft int .Fn getgroups "int gidsetlen" "gid_t *gidset" ==== //depot/projects/soc2009/trasz_limits/libexec/rtld-elf/rtld.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.149 2010/06/03 00:25:43 kan Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.151 2010/06/28 01:40:56 nwhitehorn Exp $ */ /* ==== //depot/projects/soc2009/trasz_limits/sbin/devd/devd.cc#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2003 M. Warner Losh. + * Copyright (c) 2002-2010 M. Warner Losh. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -22,6 +22,35 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * my_system is a variation on lib/libc/stdlib/system.c: + * + * Copyright (c) 1988, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ /* @@ -34,13 +63,14 @@ // - devd.conf needs more details on the supported statements. #include -__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.34 2008/12/14 11:48:51 phk Exp $"); +__FBSDID("$FreeBSD: src/sbin/devd/devd.cc,v 1.35 2010/06/29 03:52:12 imp Exp $"); #include #include #include #include #include +#include #include #include @@ -49,6 +79,7 @@ #include #include #include +#include #include #include #include @@ -152,13 +183,67 @@ // nothing } +static int +my_system(const char *command) +{ + pid_t pid, savedpid; + int pstat; + struct sigaction ign, intact, quitact; + sigset_t newsigblock, oldsigblock; + + if (!command) /* just checking... */ + return(1); + + /* + * Ignore SIGINT and SIGQUIT, block SIGCHLD. Remember to save + * existing signal dispositions. + */ + ign.sa_handler = SIG_IGN; + ::sigemptyset(&ign.sa_mask); + ign.sa_flags = 0; + ::sigaction(SIGINT, &ign, &intact); + ::sigaction(SIGQUIT, &ign, &quitact); + ::sigemptyset(&newsigblock); + ::sigaddset(&newsigblock, SIGCHLD); + ::sigprocmask(SIG_BLOCK, &newsigblock, &oldsigblock); + switch (pid = ::fork()) { + case -1: /* error */ + break; + case 0: /* child */ + /* + * Restore original signal dispositions and exec the command. + */ + ::sigaction(SIGINT, &intact, NULL); + ::sigaction(SIGQUIT, &quitact, NULL); + ::sigprocmask(SIG_SETMASK, &oldsigblock, NULL); + /* + * Close the PID file, and all other open descriptors. + * Inherit std{in,out,err} only. + */ + cfg.close_pidfile(); + ::closefrom(3); + ::execl(_PATH_BSHELL, "sh", "-c", command, (char *)NULL); + ::_exit(127); + default: /* parent */ + savedpid = pid; + do { + pid = ::wait4(savedpid, &pstat, 0, (struct rusage *)0); + } while (pid == -1 && errno == EINTR); + break; + } + ::sigaction(SIGINT, &intact, NULL); + ::sigaction(SIGQUIT, &quitact, NULL); + ::sigprocmask(SIG_SETMASK, &oldsigblock, NULL); + return (pid == -1 ? -1 : pstat); +} + bool action::do_action(config &c) { string s = c.expand_string(_cmd); if (Dflag) fprintf(stderr, "Executing '%s'\n", s.c_str()); - ::system(s.c_str()); + my_system(s.c_str()); return (true); } @@ -391,6 +476,13 @@ } void +config::close_pidfile() +{ + + pidfile_close(pfh); +} + +void config::remove_pidfile() { ==== //depot/projects/soc2009/trasz_limits/sbin/devd/devd.hh#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/devd/devd.hh,v 1.5 2007/12/21 01:00:04 imp Exp $ + * $FreeBSD: src/sbin/devd/devd.hh,v 1.6 2010/06/29 03:52:12 imp Exp $ */ #ifndef DEVD_HH @@ -153,6 +153,7 @@ void set_pidfile(const char *); void reset(); void parse(); + void close_pidfile(); void open_pidfile(); void write_pidfile(); void remove_pidfile(); ==== //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/main.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.59 2010/04/24 07:05:35 jeff Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/main.c,v 1.60 2010/06/22 00:26:07 delphij Exp $"); #include #include @@ -388,16 +388,18 @@ /* * Determine if we can and should do journal recovery. */ - if ((sblock.fs_flags & (FS_SUJ | FS_NEEDSFSCK)) == FS_SUJ) { - if (preen || reply("USE JOURNAL?")) { - if (suj_check(filesys) == 0) { - if (chkdoreload(mntp) == 0) - exit(0); - exit(4); + if ((sblock.fs_flags & FS_SUJ) == FS_SUJ) { + if ((sblock.fs_flags & FS_NEEDSFSCK) != FS_NEEDSFSCK && skipclean) { + if (preen || reply("USE JOURNAL?")) { + if (suj_check(filesys) == 0) { + printf("\n***** FILE SYSTEM MARKED CLEAN *****\n"); + if (chkdoreload(mntp) == 0) + exit(0); + exit(4); + } } - /* suj_check failed, fall through. */ + printf("** Skipping journal, falling through to full fsck\n\n"); } - printf("** Skipping journal, falling through to full fsck\n"); /* * Write the superblock so we don't try to recover the * journal on another pass. ==== //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/suj.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/suj.c,v 1.2 2010/04/24 07:58:59 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/suj.c,v 1.3 2010/06/22 00:26:07 delphij Exp $"); #include #include @@ -37,12 +37,15 @@ #include #include +#include +#include #include #include #include #include #include #include +#include #include #include @@ -141,7 +144,10 @@ uint64_t jbytes; uint64_t jrecs; +static jmp_buf jmpbuf; + typedef void (*ino_visitor)(ino_t, ufs_lbn_t, ufs2_daddr_t, int); +static void err_suj(const char *, ...) __dead2; static void ino_trunc(ino_t, off_t); static void ino_decr(ino_t); static void ino_adjust(struct suj_ino *); @@ -155,11 +161,30 @@ a = malloc(n); if (a == NULL) - errx(1, "malloc(%zu)", n); + err(EX_OSERR, "malloc(%zu)", n); return (a); } /* + * When hit a fatal error in journalling check, print out + * the error and then offer to fallback to normal fsck. + */ +static void +err_suj(const char * restrict fmt, ...) +{ + va_list ap; + + if (preen) + (void)fprintf(stdout, "%s: ", cdevname); + + va_start(ap, fmt); + (void)vfprintf(stdout, fmt, ap); + va_end(ap); + + longjmp(jmpbuf, -1); +} + +/* * Open the given provider, load superblock. */ static void @@ -169,9 +194,9 @@ return; disk = malloc(sizeof(*disk)); if (disk == NULL) - errx(1, "malloc(%zu)", sizeof(*disk)); + err(EX_OSERR, "malloc(%zu)", sizeof(*disk)); if (ufs_disk_fillout(disk, devnam) == -1) { - err(1, "ufs_disk_fillout(%s) failed: %s", devnam, + err(EX_OSERR, "ufs_disk_fillout(%s) failed: %s", devnam, disk->d_error); } fs = &disk->d_fs; @@ -203,9 +228,9 @@ fs->fs_time = time(NULL); fs->fs_mtime = time(NULL); if (sbwrite(disk, 0) == -1) - err(1, "sbwrite(%s)", devnam); + err(EX_OSERR, "sbwrite(%s)", devnam); if (ufs_disk_close(disk) == -1) - err(1, "ufs_disk_close(%s)", devnam); + err(EX_OSERR, "ufs_disk_close(%s)", devnam); free(disk); disk = NULL; fs = NULL; @@ -221,10 +246,8 @@ struct cghd *hd; struct suj_cg *sc; - if (cgx < 0 || cgx >= fs->fs_ncg) { - abort(); - errx(1, "Bad cg number %d", cgx); - } + if (cgx < 0 || cgx >= fs->fs_ncg) + err_suj("Bad cg number %d\n", cgx); if (lastcg && lastcg->sc_cgx == cgx) return (lastcg); hd = &cghash[SUJ_HASH(cgx)]; @@ -241,7 +264,7 @@ LIST_INSERT_HEAD(hd, sc, sc_next); if (bread(disk, fsbtodb(fs, cgtod(fs, sc->sc_cgx)), sc->sc_cgbuf, fs->fs_bsize) == -1) - err(1, "Unable to read cylinder group %d", sc->sc_cgx); + err_suj("Unable to read cylinder group %d\n", sc->sc_cgx); return (sc); } @@ -344,7 +367,7 @@ dblk->db_buf = errmalloc(size); dblk->db_size = size; if (bread(disk, fsbtodb(fs, blk), dblk->db_buf, size) == -1) - err(1, "Failed to read data block %jd", blk); + err_suj("Failed to read data block %jd\n", blk); } return (dblk->db_buf); } @@ -370,7 +393,7 @@ continue; if (bwrite(disk, fsbtodb(fs, dblk->db_blk), dblk->db_buf, dblk->db_size) == -1) - err(1, "Unable to write block %jd", + err_suj("Unable to write block %jd\n", dblk->db_blk); } } @@ -403,7 +426,7 @@ iblk->ib_blk = blk; LIST_INSERT_HEAD(hd, iblk, ib_next); if (bread(disk, fsbtodb(fs, blk), iblk->ib_buf, fs->fs_bsize) == -1) - err(1, "Failed to read inode block %jd", blk); + err_suj("Failed to read inode block %jd\n", blk); found: sc->sc_lastiblk = iblk; off = ino_to_fsbo(fs, ino); @@ -447,7 +470,7 @@ return; if (bwrite(disk, fsbtodb(fs, iblk->ib_blk), iblk->ib_buf, fs->fs_bsize) == -1) - err(1, "Failed to write inode block %jd", iblk->ib_blk); + err_suj("Failed to write inode block %jd\n", iblk->ib_blk); } static int @@ -679,9 +702,9 @@ return (0); level = lbn_level(cur); if (level == -1) - errx(1, "Invalid indir lbn %jd", lbn); + err_suj("Invalid indir lbn %jd\n", lbn); if (level == 0 && lbn < 0) - errx(1, "Invalid lbn %jd", lbn); + err_suj("Invalid lbn %jd\n", lbn); bap2 = (void *)dblk_read(blk, fs->fs_bsize); bap1 = (void *)bap2; lbnadd = 1; @@ -693,7 +716,7 @@ else i = (-lbn - base) / lbnadd; if (i < 0 || i >= NINDIR(fs)) - errx(1, "Invalid indirect index %d produced by lbn %jd", + err_suj("Invalid indirect index %d produced by lbn %jd\n", i, lbn); if (level == 0) cur = base + (i * lbnadd); @@ -705,10 +728,8 @@ blk = bap2[i]; if (cur == lbn) return (blk); - if (level == 0) { - abort(); - errx(1, "Invalid lbn %jd at level 0", lbn); - } + if (level == 0) + err_suj("Invalid lbn %jd at level 0\n", lbn); return indir_blkatoff(blk, ino, cur, lbn); } @@ -762,7 +783,8 @@ continue; return indir_blkatoff(DIP(ip, di_ib[i]), ino, -cur - i, lbn); } - errx(1, "lbn %jd not in ino", lbn); + err_suj("lbn %jd not in ino\n", lbn); + /* NOTREACHED */ } /* @@ -851,7 +873,7 @@ dpoff += dp->d_reclen; } while (dpoff <= doff); if (dpoff > fs->fs_bsize) - errx(1, "Corrupt directory block in dir ino %d", parent); + err_suj("Corrupt directory block in dir ino %d\n", parent); /* Not found. */ if (dpoff != doff) { if (debug) @@ -907,7 +929,7 @@ return; level = lbn_level(lbn); if (level == -1) - errx(1, "Invalid level for lbn %jd", lbn); + err_suj("Invalid level for lbn %jd\n", lbn); if ((flags & VISIT_ROOT) == 0 && blk_isindir(blk, ino, lbn) == 0) { if (debug) printf("blk %jd ino %d lbn %jd(%d) is not indir.\n", @@ -1203,7 +1225,7 @@ uint32_t gen; if (ino == ROOTINO) - errx(1, "Attempting to free ROOTINO"); + err_suj("Attempting to free ROOTINO\n"); if (debug) printf("Truncating and freeing ino %d, nlink %d, mode %o\n", ino, DIP(ip, di_nlink), DIP(ip, di_mode)); @@ -1240,9 +1262,9 @@ nlink = DIP(ip, di_nlink); mode = DIP(ip, di_mode); if (nlink < 1) - errx(1, "Inode %d link count %d invalid", ino, nlink); + err_suj("Inode %d link count %d invalid\n", ino, nlink); if (mode == 0) - errx(1, "Inode %d has a link of %d with 0 mode.", ino, nlink); + err_suj("Inode %d has a link of %d with 0 mode\n", ino, nlink); nlink--; if ((mode & IFMT) == IFDIR) reqlink = 2; @@ -1300,8 +1322,8 @@ ip = ino_read(ino); mode = DIP(ip, di_mode) & IFMT; if (nlink > LINK_MAX) - errx(1, - "ino %d nlink manipulation error, new link %d, old link %d", + err_suj( + "ino %d nlink manipulation error, new link %d, old link %d\n", >>> TRUNCATED FOR MAIL (1000 lines) <<<