Date: Thu, 29 Nov 2007 00:29:10 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 129745 for review Message-ID: <200711290029.lAT0TAWD065267@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=129745 Change 129745 by jb@jb_freebsd1 on 2007/11/29 00:28:39 IFC This loops back a lot of the opensolaris compatibility cruft which very much simplifies the diff between this project and HEAD. Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#9 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#13 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#31 integrate .. //depot/projects/dtrace/src/UPDATING#21 integrate .. //depot/projects/dtrace/src/cddl/Makefile.inc#8 integrate .. //depot/projects/dtrace/src/cddl/lib/libnvpair/Makefile#3 integrate .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate .. //depot/projects/dtrace/src/etc/defaults/periodic.conf#8 integrate .. //depot/projects/dtrace/src/etc/freebsd-update.conf#4 integrate .. //depot/projects/dtrace/src/include/elf.h#7 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#12 integrate .. //depot/projects/dtrace/src/lib/libgssapi/gss_acquire_cred.c#4 integrate .. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex.c#5 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_mutex.c#13 integrate .. //depot/projects/dtrace/src/sbin/atacontrol/atacontrol.8#4 integrate .. //depot/projects/dtrace/src/sbin/mdconfig/mdconfig.8#6 integrate .. //depot/projects/dtrace/src/sbin/newfs/newfs.8#5 integrate .. //depot/projects/dtrace/src/sbin/newfs/newfs.c#6 integrate .. //depot/projects/dtrace/src/sbin/newfs/newfs.h#5 integrate .. //depot/projects/dtrace/src/sbin/sysctl/sysctl.8#6 integrate .. //depot/projects/dtrace/src/share/man/man4/agp.4#4 integrate .. //depot/projects/dtrace/src/share/man/man4/enc.4#8 integrate .. //depot/projects/dtrace/src/share/man/man4/ichsmb.4#4 integrate .. //depot/projects/dtrace/src/share/man/man4/rl.4#5 integrate .. //depot/projects/dtrace/src/share/man/man9/stack.9#2 integrate .. //depot/projects/dtrace/src/share/misc/iso3166#5 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#24 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#26 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pci_cfgreg.h#4 integrate .. //depot/projects/dtrace/src/sys/amd64/pci/pci_cfgreg.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/arm/busdma_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/arm/arm/cpufunc.c#13 integrate .. //depot/projects/dtrace/src/sys/compat/opensolaris/rpc/xdr.h#3 integrate .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/atomic.h#4 integrate .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/time.h#5 integrate .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#32 integrate .. //depot/projects/dtrace/src/sys/conf/options#31 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#11 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#4 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#9 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/procset.h#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#3 integrate .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/amr/amr_cam.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/em/if_em.c#17 integrate .. //depot/projects/dtrace/src/sys/dev/em/if_em.h#11 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#14 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#24 integrate .. //depot/projects/dtrace/src/sys/i386/conf/XBOX#5 integrate .. //depot/projects/dtrace/src/sys/i386/pci/pci_cfgreg.c#5 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mutex.c#16 integrate .. //depot/projects/dtrace/src/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/net/if_enc.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#18 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec.c#9 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec.h#6 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec_input.c#8 integrate .. //depot/projects/dtrace/src/sys/netipsec/ipsec_output.c#5 integrate .. //depot/projects/dtrace/src/sys/netipsec/xform.h#4 integrate .. //depot/projects/dtrace/src/sys/netipsec/xform_ipip.c#5 integrate .. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#14 integrate .. //depot/projects/dtrace/src/sys/sun4v/conf/GENERIC#18 integrate .. //depot/projects/dtrace/src/sys/sys/elf.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/kernel.h#15 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#25 integrate .. //depot/projects/dtrace/src/sys/sys/signal.h#5 integrate .. //depot/projects/dtrace/src/sys/sys/stat.h#7 integrate .. //depot/projects/dtrace/src/sys/sys/time.h#12 integrate .. //depot/projects/dtrace/src/sys/sys/types.h#7 integrate .. //depot/projects/dtrace/src/tools/regression/netinet/tcpconnect/README.tcp-md5#1 branch .. //depot/projects/dtrace/src/tools/regression/netinet/tcpconnect/tcpconnect.c#4 integrate .. //depot/projects/dtrace/src/usr.bin/fstat/zfs/Makefile#2 integrate .. //depot/projects/dtrace/www/en/cgi/man.cgi#4 integrate .. //depot/projects/dtrace/www/share/sgml/commercial.isp.xml#8 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#10 (text+ko) ==== @@ -1,6 +1,6 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml,v 1.30 2007/08/23 05:12:26 chinsan Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml,v 1.31 2007/11/28 11:55:25 rwatson Exp $ --> <!-- Need more documentation on praudit, auditreduce, etc. Plus more info @@ -36,7 +36,7 @@ <see>MAC</see> </indexterm> - <para>FreeBSD 6.2-RELEASE and later include support for fine-grained + <para>&os; 6.2 and later include support for fine-grained security event auditing. Event auditing allows the reliable, fine-grained, and configurable logging of a variety of security-relevant system events, including logins, configuration @@ -191,9 +191,10 @@ <title>Installing Audit Support</title> <para>User space support for Event Auditing is installed as part of the - base &os; operating system as of 6.2-RELEASE. However, Event Auditing - support must be explicitly compiled into the kernel by adding the - following lines to the kernel configuration file:</para> + base &os; operating system. In &os; 6.3 and later, kernel support for + Event Auditing is compiled in by default. In &os; 6.2, support must be + explicitly compiled into the kernel by adding the following lines to + the kernel configuration file:</para> <programlisting>options AUDIT</programlisting> @@ -201,9 +202,9 @@ the kernel via the normal process explained in <xref linkend="kernelconfig">.</para> - <para>Once the kernel is built, installed, and the system has been - rebooted, enable the audit daemon by adding the following line to - &man.rc.conf.5;:</para> + <para>Once an audit-enabled kernel is built, installed, and the system + has been rebooted, enable the audit daemon by adding the following line + to &man.rc.conf.5;:</para> <programlisting>auditd_enable="YES"</programlisting> @@ -584,6 +585,10 @@ <literal>return</literal> token indicates the successful execution, and the <literal>trailer</literal> concludes the record.</para> + <para>In &os; 6.3 and later, <command>praudit</command> also supports + an XML output format, which can be selected using the + <option>-x</option> argument.</para> + </sect2> <sect2> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#9 (text+ko) ==== @@ -1,6 +1,6 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.73 2007/07/11 09:15:31 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.74 2007/11/28 19:37:25 remko Exp $ --> <chapter id="desktop"> @@ -875,6 +875,13 @@ <entry>light</entry> <entry><application>Tcl/Tk</application></entry> </row> + + <row> + <entry><application>KMyMoney</application></entry> + <entry>light</entry> + <entry>heavy</entry> + <entry><application>KDE</application></entry> + </row> </tbody> </tgroup> </informaltable> @@ -975,6 +982,38 @@ <screen>&prompt.root; <userinput>cd /usr/ports/deskutils/abacus</userinput> &prompt.root; <userinput>make install clean</userinput></screen> </sect2> + + <sect2> + <title>KMyMoney</title> + + <indexterm><primary><application>KMyMoney</application></primary></indexterm> + + <indexterm> + <primary>spreadsheet</primary> + <secondary><application>KMyMoney</application></secondary> + </indexterm> + + <para><application>KMyMoney</application> is a personal finance + manager built for KDE. KMyMoney intends to provide and + incorporate all the important features found in commercial + personal finance manager applications. It also highlights + ease-of-use and proper double-entry accounting among its + features. KMyMoney imports from standard Quicken Interchange + Format (QIF) files, tracks investments, handles multiple + currencies, and provides a wealth of reports. OFX import + capabilities are also available through a separate plugin.</para> + + <para>To install <application>KMyMoney</application> as a + package, do:</para> + + <screen>&prompt.root; <userinput>pkg_add -r kmymoney2</userinput></screen> + + <para>If the package is not available, you can use the ports + collection by doing:</para> + + <screen>&prompt.root; <userinput>cd /usr/ports/finance/kmymoney2</userinput> +&prompt.root; <userinput>make install clean</userinput></screen> + </sect2> </sect1> <sect1 id="desktop-summary"> ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.101 2007/08/15 19:02:48 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml,v 1.102 2007/11/28 21:26:59 remko Exp $ --> <chapter id="network-servers"> @@ -3819,7 +3819,7 @@ install <application>Apache</application> when you first installed FreeBSD, then you can install it from the <filename role="package">www/apache13</filename> or <filename - role="package">www/apache20</filename> port.</para> + role="package">www/apache22</filename> port.</para> <para>Once <application>Apache</application> has been installed successfully, it must be configured.</para> @@ -3952,6 +3952,10 @@ <programlisting>apache_enable="YES"</programlisting> + <para>or for <application>Apache</application> 2.2:</para> + + <programlisting>apache22_enable="YES"</programlisting> + <para>If you would like to supply additional command line options for the <application>Apache</application> <command>httpd</command> program started at system boot, you @@ -4041,7 +4045,7 @@ 1.3.X that includes <application>mod_ssl</application> may be installed with the <filename role="package">www/apache13-modssl</filename> port. SSL support is also available for <application>Apache</application> 2.X in the - <filename role="package">www/apache20</filename> port, + <filename role="package">www/apache22</filename> port, where it is enabled by default.</para> <!-- XXX add more information about configuring mod_ssl here. --> @@ -4082,7 +4086,7 @@ remember that <application>mod_perl</application> 1.0 only works with <application>Apache</application> 1.3 and <application>mod_perl</application> 2.0 only works with - <application>Apache</application> 2. + <application>Apache</application> 2.X. <application>mod_perl</application> 1.0 is available in <filename role="package">www/mod_perl</filename> and a statically compiled version is available in ==== //depot/projects/dtrace/src/ObsoleteFiles.inc#31 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.121 2007/11/27 13:58:25 brix Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.122 2007/11/28 23:21:55 jb Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20071129: Removed a Solaris compatibility header +OLD_FILES+=usr/include/sys/_elf_solaris.h # 20071108: Removed very crunch OLDCARD support file OLD_FILES+=etc/defaults/pccard.conf # 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64. ==== //depot/projects/dtrace/src/UPDATING#21 (text+ko) ==== @@ -21,6 +21,10 @@ developers choose to disable these features on build machines to maximize performance. +20071128: + The ADAPTIVE_GIANT kernel option has been retired because its + functionality is the default now. + 20071118: The AT keyboard emulation of sunkbd(4) has been turned on by default. In order to make the special symbols of the Sun @@ -945,4 +949,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.512 2007/11/18 18:11:16 marius Exp $ +$FreeBSD: src/UPDATING,v 1.513 2007/11/28 13:04:11 matteo Exp $ ==== //depot/projects/dtrace/src/cddl/Makefile.inc#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $ +# $FreeBSD: src/cddl/Makefile.inc,v 1.3 2007/11/28 22:58:09 jb Exp $ OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../contrib/opensolaris OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/contrib/opensolaris ==== //depot/projects/dtrace/src/cddl/lib/libnvpair/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ +# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.3 2007/11/28 22:58:09 jb Exp $ .PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 (text+ko) ==== ==== //depot/projects/dtrace/src/etc/defaults/periodic.conf#8 (text+ko) ==== @@ -13,7 +13,7 @@ # For a more detailed explanation of all the periodic.conf variables, please # refer to the periodic.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.44 2007/05/29 06:22:13 dougb Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.45 2007/11/28 17:31:11 jhb Exp $ # # What files override these defaults ? @@ -45,7 +45,9 @@ daily_clean_tmps_enable="NO" # Delete stuff daily daily_clean_tmps_dirs="/tmp" # Delete under here daily_clean_tmps_days="3" # If not accessed for -daily_clean_tmps_ignore=".X*-lock quota.user quota.group" # Don't delete these +daily_clean_tmps_ignore=".X*-lock .X11-unix .ICE-unix .font-unix .XIM-unix" +daily_clean_tmps_ignore="$daily_clean_tmps_ignore quota.user quota.group" + # Don't delete these daily_clean_tmps_verbose="YES" # Mention files deleted # 120.clean-preserve ==== //depot/projects/dtrace/src/etc/freebsd-update.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/freebsd-update.conf,v 1.2 2007/11/12 04:47:57 cperciva Exp $ +# $FreeBSD: src/etc/freebsd-update.conf,v 1.3 2007/11/28 22:45:09 cperciva Exp $ # Trusted keyprint. Changing this is a Bad Idea unless you've received # a PGP-signed email from <security-officer@FreeBSD.org> telling you to @@ -24,7 +24,7 @@ # Paths which start with anything matching an entry in an UpdateIfUnmodified # statement will only be updated if the contents of the file have not been # modified by the user (unless changes are merged; see below). -UpdateIfUnmodified /etc/ /var/ +UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile # When upgrading to a new FreeBSD release, files which match MergeChanges # will have any local changes merged into the version from the new release. ==== //depot/projects/dtrace/src/include/elf.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/elf.h,v 1.9 2006/10/04 07:25:55 jb Exp $ + * $FreeBSD: src/include/elf.h,v 1.10 2007/11/28 22:09:12 jb Exp $ */ /* ==== //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#12 (text+ko) ==== @@ -105,7 +105,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.151 2007/11/27 03:17:30 jasone Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.152 2007/11/28 00:17:34 jasone Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -2598,7 +2598,7 @@ /* Large allocation. */ size = PAGE_CEILING(size); arena_lock_balance(arena); - ret = (void *)arena_run_alloc(arena, size, true); // XXX zero? + ret = (void *)arena_run_alloc(arena, size, zero); if (ret == NULL) { malloc_spin_unlock(&arena->lock); return (NULL); ==== //depot/projects/dtrace/src/lib/libgssapi/gss_acquire_cred.c#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/lib/libgssapi/gss_acquire_cred.c,v 1.1 2005/12/29 14:40:20 dfr Exp $ + * $FreeBSD: src/lib/libgssapi/gss_acquire_cred.c,v 1.2 2007/11/28 08:50:20 dfr Exp $ */ #include <gssapi/gssapi.h> @@ -59,8 +59,8 @@ * First make sure that at least one of the requested * mechanisms is one that we support. */ + _gss_load_mech(); if (mechs) { - _gss_load_mech(); for (i = 0; i < mechs->count; i++) { int t; gss_test_oid_set_member(minor_status, @@ -73,6 +73,8 @@ *minor_status = 0; return (GSS_S_BAD_MECH); } + } else { + mechs = _gss_mech_oids; } if (actual_mechs) { @@ -92,9 +94,6 @@ cred->gc_usage = cred_usage; SLIST_INIT(&cred->gc_mc); - if (mechs == GSS_C_NO_OID_SET) - mechs = _gss_mech_oids; - set.count = 1; min_time = GSS_C_INDEFINITE; for (i = 0; i < mechs->count; i++) { ==== //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libkse/thread/thr_mutex.c,v 1.55 2007/11/27 03:16:44 jasone Exp $ + * $FreeBSD: src/lib/libkse/thread/thr_mutex.c,v 1.56 2007/11/28 00:16:24 jasone Exp $ */ #include <stdlib.h> #include <errno.h> @@ -254,8 +254,9 @@ .m_ceiling = 0, .m_flags = 0 }; + static const struct pthread_mutex_attr *pattr = &attr; - return (thr_mutex_init(mutex, (pthread_mutexattr_t *)&attr, + return (thr_mutex_init(mutex, (pthread_mutexattr_t *)&pattr, calloc_cb)); } ==== //depot/projects/dtrace/src/lib/libthr/thread/thr_mutex.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.62 2007/11/27 03:16:43 jasone Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.63 2007/11/28 00:16:24 jasone Exp $ */ #include "namespace.h" @@ -212,19 +212,15 @@ _pthread_mutex_init_calloc_cb(pthread_mutex_t *mutex, void *(calloc_cb)(size_t, size_t)) { -/* XXX Enable adaptive locking if similar code is removed from malloc. */ -#if 0 static const struct pthread_mutex_attr attr = { - .m_type = PTHREAD_MUTEX_ADAPTIVE_NP, + .m_type = PTHREAD_MUTEX_NORMAL, .m_protocol = PTHREAD_PRIO_NONE, .m_ceiling = 0, .m_flags = 0 }; + static const struct pthread_mutex_attr *pattr = &attr; - return mutex_init(mutex, (pthread_mutexattr_t *)&attr, 0, calloc_cb); -#else - return mutex_init(mutex, NULL, 0, calloc_cb); -#endif + return mutex_init(mutex, (pthread_mutexattr_t *)&pattr, 0, calloc_cb); } void ==== //depot/projects/dtrace/src/sbin/atacontrol/atacontrol.8#4 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/atacontrol/atacontrol.8,v 1.28 2005/11/18 10:32:09 ru Exp $ +.\" $FreeBSD: src/sbin/atacontrol/atacontrol.8,v 1.29 2007/11/28 21:37:25 remko Exp $ .\" -.Dd August 16, 2005 +.Dd November 28, 2007 .Dt ATACONTROL 8 .Os .Sh NAME @@ -221,6 +221,110 @@ The new modes are set as soon as the .Nm command returns. +.Pp +The atacontrol command can also be used to create purely software +RAID arrays in systems that do NOT have a "real" hardware RAID card +such as a Highpoint or Promise card. +A common scenario is a 1U server such as the HP DL320 G4 or G5. +These servers contain a SATA controller that has 2 channels that can +contain 2 disks per channel, but the servers are wired to only place +a single SATA drive on each channel. +These servers do have a "pseudo" RAID BIOS but it uses a proprietary +format that is not compatible with the ata driver, and thus their +RAID bios must be switched off. +Another common scenario would be a Promise UDMA100 controller card +that did not contain the Fasttrack RAID BIOS, but did contain 2 +UDMA channels. +1 disk would be attached to one channel and the other disk would be +attached to the other channel. +It is NOT recommended to create such arrays on a primary/secondary +pair on a SINGLE channel since the throughput of the mirror would be +severely compromised, the ability to rebuild the array in the event +of a disk failure would be greatly complicated, and if a disk +controller electronics failed it could wedge the channel and take +both disks in the mirror offline. +(which would defeat the purpose of having a mirror in the first place) +.Pp +A quick and dirty way to create such a mirrored array on a new +system is to boot off the FreeBSD install CD, do a minimal scratch +install, abort out of the post install questions, and at the command +line issue the command: +.Pp +.Dl "atacontrol create RAID1 ad4 ad6" +.Pp +then immediately issue a reboot and boot from the installation CD +again, and during the installation, you will now see "ar0" listed +as a disk to install on, and install on that instead of ad4, ad6, etc. +.Pp +To get information about the status of a RAID array in the system +use the command line: +.Pp +.Dl "atacontrol status ar0" +.Pp +A typical output showing good health on a RAID array might be as +follows: +.Pp +.Dl "ar0: ATA RAID1 subdisks: ad4 ad6 status: READY" +.Pp +If a disk drive in a RAID1 array dies the system will mark the disk +in a DOWN state and change the array status to DEGRADED. +This can ALSO happen in rare instances due to a power fluctuation or +other event causing the system to not shutdown properly. +In that case the output will look like the following: +.Pp +.Dl "ar0: ATA RAID1 subdisks: ad4 DOWN status: DEGRADED" +.Pp +For a mirrored RAID1 system the server WILL ALLOW you to remove a +dead SATA disk drive (if the drive is in a hot-swap tray) without +freezing up the system, so you can remove the disk and while you are +obtaining a replacement the server can run from the active disk. +The only caveat is that if the active disk is ad6, the system most +likely will NOT be able to be rebooted since most systems only +support booting from the first disk drive. +.Pp +To deactivate the DOWN disk ad6 to allow for it to be ejected, use +the following: +.Pp +.Dl "atacontrol detach ata3" +.Pp +then eject or remove the disk. +Note that this only works if the 2 disks in the mirror are on separate +channels (which is the standard setup for 1-U servers like the HP DL320). +When the new disk drive is obtained, make sure it is blank, then shut +the system down. +At this point, if the system has a RAID array card like a Highpoint or +Promise controller, you may then boot it into the BIOS of the card and use +the manufacturers RAID array rebuild utilities to rebuild the array. +.Pp +If the system has a pure software array and is not using a "real" ATA +RAID controller, then shut the system down, make sure that the disk +that was still working is moved to the bootable position (channel 0 +or whatever the BIOS allows the system to boot from) and the blank disk +is placed in the secondary position, then boot the system into +single-user mode and issue the command: +.Pp +.Dl "atacontrol addspare ar0 ad6" +.Dl "atacontrol rebuild ar0" +.Pp +If the disk drive did NOT fail and the RAID array became unmirrored due +to a software glitch or improper shutdown, then a slightly different +process must be followed. +Begin by issuing the detach command (this shows the detach for disk ad6, +the primary master on channel 3): +.Pp +.Dl "atacontrol detach ata3" +.Pp +then reboot the system into single-user mode. +(don't just init the system, reboot it so that both disks get probed) +You will probably see TWO mirrored RAID arrays appear during the boot +messages, ar0 and ar1. +Issue the command: +.Pp +.Dl "atacontrol delete ar1" +.Dl "atacontrol addspare ar0 ad6" +.Pp +Now a status command will show the array rebuilding. +.Pp .Sh SEE ALSO .Xr ata 4 .Sh HISTORY ==== //depot/projects/dtrace/src/sbin/mdconfig/mdconfig.8#6 (text+ko) ==== @@ -39,9 +39,9 @@ .\" @(#)vnconfig.8 8.1 (Berkeley) 6/5/93 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29 .\" -.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.40 2007/11/11 08:14:22 keramida Exp $ +.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.42 2007/11/28 12:29:59 remko Exp $ .\" -.Dd November 11, 2007 +.Dd November 28, 2007 .Dt MDCONFIG 8 .Os .Sh NAME @@ -98,7 +98,15 @@ .Fl f Ar file becomes the backing store for this memory disk. .It Cm swap -Swap space is used to back this memory disk. +Storage for this type of memory disk is allocated from buffer +memory. +Pages get pushed out to the swap when the system is under memory +pressure, otherwise they stay in the operating memory. +Using +.Cm swap +backing is generally preferable over +.Cm malloc +backing. .El .It Fl f Ar file Filename to use for the vnode type memory disk. Options ==== //depot/projects/dtrace/src/sbin/newfs/newfs.8#5 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)newfs.8 8.6 (Berkeley) 5/3/95 -.\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.70 2006/10/31 21:52:27 pjd Exp $ +.\" $FreeBSD: src/sbin/newfs/newfs.8,v 1.71 2007/11/28 07:29:10 yar Exp $ .\" .Dd January 21, 2005 .Dt NEWFS 8 @@ -52,6 +52,7 @@ .Op Fl i Ar bytes .Op Fl m Ar free-space .Op Fl o Ar optimization +.Op Fl r Ar reserved .Op Fl s Ar size .Ar special .Sh DESCRIPTION @@ -196,14 +197,30 @@ See .Xr tunefs 8 for more details on how to set this option. +.It Fl r Ar reserved +The size, in sectors, of reserved space +at the end of the partition specified in +.Ar special . +This space will not be occupied by the file system; +it can be used by other consumers such as +.Xr geom 4 . +Defaults to 0. .It Fl s Ar size The size of the file system in sectors. This value defaults to the size of the raw partition specified in .Ar special -(in other words, -.Nm -will use the entire partition for the file system). +less the +.Ar reserved +space at its end (see +.Fl r ) . +A +.Ar size +of 0 can also be used to choose the default value. +A valid +.Ar size +value cannot be larger than the default one, +which means that the file system cannot extend into the reserved space. .El .Pp The following options override the standard sizes for the disk geometry. @@ -237,6 +254,7 @@ on file systems that contain many small files. .Sh SEE ALSO .Xr fdformat 1 , +.Xr geom 4 , .Xr disktab 5 , .Xr fs 5 , .Xr bsdlabel 8 , ==== //depot/projects/dtrace/src/sbin/newfs/newfs.c#6 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/newfs/newfs.c,v 1.82 2007/03/02 20:07:59 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/newfs/newfs.c,v 1.84 2007/11/28 07:54:42 yar Exp $"); /* * newfs: friendly front end to mkfs @@ -120,7 +120,7 @@ int Jflag; /* enable gjournal for file system */ int lflag; /* enable multilabel for file system */ int nflag; /* do not create .snap directory */ -quad_t fssize; /* file system size */ +intmax_t fssize; /* file system size */ int sectorsize; /* bytes/sector */ int realsectorsize; /* bytes/sector in hardware */ int fsize = 0; /* fragment size */ @@ -141,6 +141,7 @@ static char *disktype; static int unlabeled; +static void getfssize(intmax_t *, const char *p, intmax_t, intmax_t); static struct disklabel *getdisklabel(char *s); static void rewritelabel(char *s, struct disklabel *lp); static void usage(void); @@ -153,11 +154,13 @@ struct partition oldpartition; struct stat st; char *cp, *special; + intmax_t reserved; int ch, i; off_t mediasize; + reserved = 0; while ((ch = getopt(argc, argv, - "EJL:NO:RS:T:Ua:b:c:d:e:f:g:h:i:lm:no:s:")) != -1) + "EJL:NO:RS:T:Ua:b:c:d:e:f:g:h:i:lm:no:r:s:")) != -1) switch (ch) { case 'E': Eflag++; @@ -262,11 +265,19 @@ "%s: unknown optimization preference: use `space' or `time'", optarg); break; + case 'r': + errno = 0; + reserved = strtoimax(optarg, &cp, 0); + if (errno != 0 || cp == optarg || + *cp != '\0' || reserved < 0) + errx(1, "%s: bad reserved size", optarg); + break; case 's': errno = 0; - fssize = strtoimax(optarg, NULL, 0); - if (errno != 0) - err(1, "%s: bad file system size", optarg); + fssize = strtoimax(optarg, &cp, 0); + if (errno != 0 || cp == optarg || + *cp != '\0' || fssize < 0) + errx(1, "%s: bad file system size", optarg); break; case '?': default: @@ -301,14 +312,10 @@ errx(1, "%s: not a character-special device", special); if (sectorsize == 0) - ioctl(disk.d_fd, DIOCGSECTORSIZE, §orsize); - if (sectorsize && !ioctl(disk.d_fd, DIOCGMEDIASIZE, &mediasize)) { - if (fssize == 0) - fssize = mediasize / sectorsize; - else if (fssize > mediasize / sectorsize) - errx(1, "%s: maximum file system size is %jd", - special, (intmax_t)(mediasize / sectorsize)); - } + if (ioctl(disk.d_fd, DIOCGSECTORSIZE, §orsize) == -1) + sectorsize = 0; /* back out on error for safety */ + if (sectorsize && ioctl(disk.d_fd, DIOCGMEDIASIZE, &mediasize) != -1) + getfssize(&fssize, special, mediasize / sectorsize, reserved); pp = NULL; lp = getdisklabel(special); if (lp != NULL) { @@ -328,11 +335,7 @@ if (pp->p_fstype == FS_BOOT) errx(1, "%s: `%c' partition overlaps boot program", special, *cp); - if (fssize == 0) - fssize = pp->p_size; - if (fssize > pp->p_size) - errx(1, - "%s: maximum file system size %d", special, pp->p_size); + getfssize(&fssize, special, pp->p_size, reserved); if (sectorsize == 0) sectorsize = lp->d_secsize; if (fsize == 0) @@ -385,13 +388,29 @@ exit(0); } +void +getfssize(intmax_t *fsz, const char *s, intmax_t disksize, intmax_t reserved) +{ + intmax_t available; + + available = disksize - reserved; + if (available <= 0) + errx(1, "%s: reserved not less than device size %jd", + s, disksize); + if (*fsz == 0) + *fsz = available; + else if (*fsz > available) + errx(1, "%s: maximum file system size is %jd", + s, available); +} + struct disklabel * getdisklabel(char *s) { static struct disklabel lab; struct disklabel *lp; - if (!ioctl(disk.d_fd, DIOCGDINFO, (char *)&lab)) + if (ioctl(disk.d_fd, DIOCGDINFO, (char *)&lab) != -1) return (&lab); unlabeled++; if (disktype) { @@ -409,7 +428,7 @@ return; lp->d_checksum = 0; lp->d_checksum = dkcksum(lp); - if (ioctl(disk.d_fd, DIOCWDINFO, (char *)lp) < 0) + if (ioctl(disk.d_fd, DIOCWDINFO, (char *)lp) == -1) warn("ioctl (WDINFO): %s: can't rewrite disk label", s); } @@ -443,6 +462,7 @@ fprintf(stderr, "\t-n do not create .snap directory\n"); fprintf(stderr, "\t-m minimum free space %%\n"); fprintf(stderr, "\t-o optimization preference (`space' or `time')\n"); - fprintf(stderr, "\t-s file systemsize (sectors)\n"); + fprintf(stderr, "\t-r reserved sectors at the end of device\n"); + fprintf(stderr, "\t-s file system size (sectors)\n"); exit(1); } ==== //depot/projects/dtrace/src/sbin/newfs/newfs.h#5 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/newfs/newfs.h,v 1.18 2006/10/31 21:52:27 pjd Exp $ + * $FreeBSD: src/sbin/newfs/newfs.h,v 1.19 2007/11/28 07:29:10 yar Exp $ */ #include <libufs.h> @@ -52,7 +52,7 @@ extern int Jflag; /* enable gjournal for file system */ extern int lflag; /* enable multilabel MAC for file system */ extern int nflag; /* do not create .snap directory */ -extern quad_t fssize; /* file system size */ +extern intmax_t fssize; /* file system size */ extern int sectorsize; /* bytes/sector */ extern int realsectorsize; /* bytes/sector in hardware*/ extern int fsize; /* fragment size */ ==== //depot/projects/dtrace/src/sbin/sysctl/sysctl.8#6 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.63 2007/10/15 20:00:19 netchild Exp $ +.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.64 2007/11/28 14:48:30 remko Exp $ .\" -.Dd September 15, 2005 +.Dd November 28, 2007 .Dt SYSCTL 8 .Os .Sh NAME @@ -198,7 +198,6 @@ .It "kern.osreldate string no .It "kern.bootfile string yes .It "kern.corefile string yes -.It "kern.dumpdev dev_t yes .It "kern.logsigexit integer yes .It "security.bsd.suser_enabled integer yes .It "security.bsd.see_other_uids integer yes @@ -270,14 +269,6 @@ .Pp .Dl "sysctl kern.maxprocperuid=1000" .Pp -The device used for crash dumps can be specified using: -.Pp -.Dl "sysctl kern.dumpdev=/dev/somedev" -.Pp -which is equivalent to -.Pp -.Dl "dumpon /dev/somedev" -.Pp Information about the system clock rate may be obtained with: .Pp .Dl "sysctl kern.clockrate" ==== //depot/projects/dtrace/src/share/man/man4/agp.4#4 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/agp.4,v 1.10 2006/02/17 06:29:51 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/agp.4,v 1.11 2007/11/28 12:04:25 remko Exp $ .\" -.Dd February 17, 2006 +.Dd November 28, 2007 .Dt AGP 4 .Os .Sh NAME @@ -48,7 +48,7 @@ .It Intel: i820, i840, i845, i850, and i860 host to AGP bridges .It Intel: -i810, i810-DC100, i810E, i815, 830M, 845G, 852GM, 852GME, 855GM, 855GME, 865G, 915G and 915GM SVGA controllers +i810, i810-DC100, i810E, i815, 830M, 845G, 845M, 852GM, 852GME, 855GM, 855GME, 865G, 915G and 915GM SVGA controllers .It Intel: 82443BX, 82443GX, 82443LX, 82815, 82820, 82830, 82840, 82845, 82845G, 82850, 82855, 82855GM, 82860, 82865, 82875P, E7205 and E7505 host to AGP bridges .It NVIDIA: ==== //depot/projects/dtrace/src/share/man/man4/enc.4#8 (text+ko) ==== @@ -31,7 +31,7 @@ .\" .\" $FreeBSD: src/share/man/man4/enc.4,v 1.5 2007/08/02 08:04:48 bz Exp $ .\" -.Dd August 1, 2007 +.Dd November 28, 2007 .Dt ENC 4 .Os .Sh NAME @@ -56,10 +56,10 @@ .Pp The .Nm -interface allows an administrator -to see outgoing packets before they have been processed by -.Xr ipsec 4 , -or incoming packets after they have been similarly processed, via +interface allows an administrator to see incoming and outgoing packets +before and after they will be or have been processed by +.Xr ipsec 4 +via .Xr tcpdump 1 . .Pp The @@ -72,10 +72,55 @@ on the .Dq Li enc0 interface. +.Pp +What can be seen with +.Xr tcpdump 1 +and what will be passed on to the firewalls via the +.Xr pfil 9 +framework can be independently controlled using the following +.Xr sysctl 8 +variables: +.Bl -column net.enc.out.ipsec_filter_mask 0x00000000 0x00000000 +.It Sy "Name Defaults Suggested" +.It "net.enc.out.ipsec_bpf_mask" 0x00000003 0x00000001 +.It "net.enc.out.ipsec_filter_mask" 0x00000001 0x00000001 >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711290029.lAT0TAWD065267>