Date: Mon, 23 Oct 2006 02:22:41 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 108285 for review Message-ID: <200610230222.k9N2Mf1T005962@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=108285 Change 108285 by marcel@marcel_nfs on 2006/10/23 02:22:18 IFC @108284 Affected files ... .. //depot/projects/ia64/ObsoleteFiles.inc#9 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/Makefile#3 integrate .. //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kgdb.1#7 integrate .. //depot/projects/ia64/lib/libc/stdio/xprintf.c#3 integrate .. //depot/projects/ia64/lib/libc/sys/read.2#15 integrate .. //depot/projects/ia64/lib/libc/sys/write.2#13 integrate .. //depot/projects/ia64/lib/libvgl/vgl.3#7 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#163 integrate .. //depot/projects/ia64/sbin/devd/devd.conf.5#9 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.8#16 integrate .. //depot/projects/ia64/share/man/man4/if_bridge.4#11 integrate .. //depot/projects/ia64/share/man/man4/sis.4#10 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#76 integrate .. //depot/projects/ia64/share/man/man8/intro.8#8 integrate .. //depot/projects/ia64/share/man/man9/zone.9#13 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#56 integrate .. //depot/projects/ia64/sys/boot/arm/Makefile#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/Makefile.inc#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot0spi/main.c#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootiic/env_vars.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootiic/loader_prompt.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/Makefile#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/arm_init.S#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/env_vars.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/loader_prompt.c#2 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/main.c#3 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.c#27 integrate .. //depot/projects/ia64/sys/compat/linux/linux_getcwd.c#19 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#47 integrate .. //depot/projects/ia64/sys/compat/linux/linux_stats.c#29 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_fcntl.c#15 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_misc.c#38 integrate .. //depot/projects/ia64/sys/conf/files#146 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf.c#20 integrate .. //depot/projects/ia64/sys/crypto/sha2/sha2.c#8 integrate .. //depot/projects/ia64/sys/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#11 integrate .. //depot/projects/ia64/sys/dev/iwi/if_iwireg.h#8 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_devs.c#22 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#49 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#96 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#36 integrate .. //depot/projects/ia64/sys/i386/ibcs2/ibcs2_misc.c#24 integrate .. //depot/projects/ia64/sys/ia64/ia64/nexus.c#15 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#98 integrate .. //depot/projects/ia64/sys/kern/init_main.c#57 integrate .. //depot/projects/ia64/sys/kern/kern_acct.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_acl.c#23 integrate .. //depot/projects/ia64/sys/kern/kern_alq.c#14 integrate .. //depot/projects/ia64/sys/kern/kern_environment.c#17 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#84 integrate .. //depot/projects/ia64/sys/kern/kern_exit.c#73 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#66 integrate .. //depot/projects/ia64/sys/kern/kern_jail.c#29 integrate .. //depot/projects/ia64/sys/kern/kern_ktrace.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_linker.c#41 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#44 integrate .. //depot/projects/ia64/sys/kern/kern_mbuf.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_prot.c#46 integrate .. //depot/projects/ia64/sys/kern/kern_shutdown.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#94 integrate .. //depot/projects/ia64/sys/kern/kern_sysctl.c#33 integrate .. //depot/projects/ia64/sys/kern/kern_time.c#34 integrate .. //depot/projects/ia64/sys/kern/link_elf.c#29 integrate .. //depot/projects/ia64/sys/kern/link_elf_obj.c#8 integrate .. //depot/projects/ia64/sys/kern/subr_fattime.c#1 branch .. //depot/projects/ia64/sys/kern/subr_trap.c#52 integrate .. //depot/projects/ia64/sys/kern/sys_pipe.c#56 integrate .. //depot/projects/ia64/sys/kern/sys_socket.c#25 integrate .. //depot/projects/ia64/sys/kern/sysv_msg.c#22 integrate .. //depot/projects/ia64/sys/kern/sysv_sem.c#29 integrate .. //depot/projects/ia64/sys/kern/sysv_shm.c#29 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf.c#39 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf2.c#21 integrate .. //depot/projects/ia64/sys/kern/uipc_sem.c#20 integrate .. //depot/projects/ia64/sys/kern/uipc_socket.c#59 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#63 integrate .. //depot/projects/ia64/sys/kern/uipc_usrreq.c#49 integrate .. //depot/projects/ia64/sys/kern/vfs_bio.c#86 integrate .. //depot/projects/ia64/sys/kern/vfs_cluster.c#42 integrate .. //depot/projects/ia64/sys/kern/vfs_lookup.c#27 integrate .. //depot/projects/ia64/sys/kern/vfs_mount.c#52 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#91 integrate .. //depot/projects/ia64/sys/kern/vfs_syscalls.c#75 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#56 integrate .. //depot/projects/ia64/sys/net/bpf.c#46 integrate .. //depot/projects/ia64/sys/net/bsd_comp.c#12 integrate .. //depot/projects/ia64/sys/net/if.c#53 integrate .. //depot/projects/ia64/sys/net/if_atmsubr.c#21 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#52 integrate .. //depot/projects/ia64/sys/net/if_fddisubr.c#22 integrate .. //depot/projects/ia64/sys/net/if_fwsubr.c#10 integrate .. //depot/projects/ia64/sys/net/if_gif.c#29 integrate .. //depot/projects/ia64/sys/net/if_iso88025subr.c#21 integrate .. //depot/projects/ia64/sys/net/if_ppp.c#28 integrate .. //depot/projects/ia64/sys/net/if_stf.c#31 integrate .. //depot/projects/ia64/sys/net/if_tun.c#35 integrate .. //depot/projects/ia64/sys/netatalk/aarp.c#17 integrate .. //depot/projects/ia64/sys/netatalk/ddp_input.c#13 integrate .. //depot/projects/ia64/sys/netatalk/ddp_output.c#12 integrate .. //depot/projects/ia64/sys/netinet/if_ether.c#39 integrate .. //depot/projects/ia64/sys/netinet/igmp.c#18 integrate .. //depot/projects/ia64/sys/netinet/in_pcb.c#48 integrate .. //depot/projects/ia64/sys/netinet/ip_divert.c#36 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#60 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.c#32 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#65 integrate .. //depot/projects/ia64/sys/netinet/ip_mroute.c#39 integrate .. //depot/projects/ia64/sys/netinet/ip_options.c#2 integrate .. //depot/projects/ia64/sys/netinet/ip_output.c#57 integrate .. //depot/projects/ia64/sys/netinet/raw_ip.c#49 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#72 integrate .. //depot/projects/ia64/sys/netinet/tcp_output.c#37 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#59 integrate .. //depot/projects/ia64/sys/netinet/tcp_syncache.c#44 integrate .. //depot/projects/ia64/sys/netinet/udp_usrreq.c#48 integrate .. //depot/projects/ia64/sys/netinet6/nd6.c#28 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_srvsock.c#24 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#27 integrate .. //depot/projects/ia64/sys/pci/agp.c#31 integrate .. //depot/projects/ia64/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/ia64/sys/security/mac/mac_inet.c#3 integrate .. //depot/projects/ia64/sys/security/mac/mac_label.c#4 integrate .. //depot/projects/ia64/sys/security/mac/mac_net.c#10 integrate .. //depot/projects/ia64/sys/security/mac/mac_pipe.c#5 integrate .. //depot/projects/ia64/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/ia64/sys/security/mac/mac_process.c#9 integrate .. //depot/projects/ia64/sys/security/mac/mac_socket.c#6 integrate .. //depot/projects/ia64/sys/security/mac/mac_system.c#5 integrate .. //depot/projects/ia64/sys/security/mac/mac_sysv_msg.c#4 integrate .. //depot/projects/ia64/sys/security/mac/mac_sysv_sem.c#4 integrate .. //depot/projects/ia64/sys/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/ia64/sys/security/mac/mac_vfs.c#10 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#26 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/ia64/sys/sys/clock.h#4 integrate .. //depot/projects/ia64/sys/sys/mac.h#36 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#33 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vfsops.c#64 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#56 integrate .. //depot/projects/ia64/sys/vm/device_pager.c#23 integrate .. //depot/projects/ia64/sys/vm/phys_pager.c#14 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#61 integrate .. //depot/projects/ia64/sys/vm/vm_contig.c#33 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#57 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#86 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#47 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#90 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#79 integrate .. //depot/projects/ia64/sys/vm/vm_page.h#38 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#62 integrate .. //depot/projects/ia64/usr.bin/quota/Makefile#3 integrate .. //depot/projects/ia64/usr.bin/quota/quota.1#6 integrate .. //depot/projects/ia64/usr.bin/quota/quota.c#10 integrate .. //depot/projects/ia64/usr.bin/tail/forward.c#13 integrate .. //depot/projects/ia64/usr.bin/vmstat/vmstat.8#14 integrate .. //depot/projects/ia64/usr.bin/vmstat/vmstat.c#28 integrate .. //depot/projects/ia64/usr.sbin/config/config.8#13 integrate .. //depot/projects/ia64/usr.sbin/freebsd-update/freebsd-update.sh#2 integrate .. //depot/projects/ia64/usr.sbin/portsnap/portsnap/portsnap.sh#8 integrate Differences ... ==== //depot/projects/ia64/ObsoleteFiles.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.55 2006/10/01 17:48:43 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.56 2006/10/21 14:19:52 ru 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. # +# 20061018: pccardc removed +OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz # 20060930: demangle.h from contrib/libstdc++/include/ext/ OLD_FILES+=usr/include/c++/3.4/ext/demangle.h # 20060929: mrouted removed ==== //depot/projects/ia64/gnu/usr.bin/gdb/Makefile#3 (text+ko) ==== @@ -1,5 +1,9 @@ -# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.11 2006/08/24 21:53:49 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/gdb/Makefile,v 1.12 2006/10/21 17:27:36 jmg Exp $ SUBDIR= doc libgdb gdb gdbtui kgdb +.if ${MACHINE_ARCH} == "i386" +SUBDIR+=gdbserver +.endif + .include <bsd.subdir.mk> ==== //depot/projects/ia64/gnu/usr.bin/gdb/kgdb/kgdb.1#7 (text+ko) ==== @@ -22,8 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.9 2006/10/11 14:42:43 obrien Exp $ -.Dd March 2, 2005 +.\" $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.1,v 1.10 2006/10/21 17:39:35 ru Exp $ +.\" +.Dd October 11, 2006 .Os .Dt KGDB 1 .Sh NAME ==== //depot/projects/ia64/lib/libc/stdio/xprintf.c#3 (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/libc/stdio/xprintf.c,v 1.3 2006/04/01 19:06:54 phk Exp $ + * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.4 2006/10/21 11:49:07 kib Exp $ */ #include <namespace.h> @@ -261,7 +261,7 @@ static int -__v2printf(FILE *fp, const char *fmt0, unsigned pct, const va_list ap) +__v2printf(FILE *fp, const char *fmt0, unsigned pct, const va_list ap1) { struct printf_info *pi, *pil; const char *fmt; @@ -274,7 +274,9 @@ int ret = 0; int n; struct __printf_io io; + va_list ap; + va_copy(ap, ap1); __printf_init(&io); io.fp = fp; @@ -561,6 +563,7 @@ errx(1, "render[%c] = NULL", *fmt); } __printf_flush(&io); + va_end(ap); return (ret); } ==== //depot/projects/ia64/lib/libc/sys/read.2#15 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)read.2 8.4 (Berkeley) 2/26/94 -.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.33 2006/10/11 13:33:02 maxim Exp $ +.\" $FreeBSD: src/lib/libc/sys/read.2,v 1.34 2006/10/21 18:03:53 ru Exp $ .\" .Dd October 11, 2006 .Dt READ 2 @@ -170,7 +170,7 @@ An I/O error occurred while reading from the file system. .It Bq Er EINTR A read from a slow device -(i.e. one that might block for an arbitrary amount of time) +(i.e.\& one that might block for an arbitrary amount of time) was interrupted by the delivery of a signal before any data arrived. .It Bq Er EINVAL ==== //depot/projects/ia64/lib/libc/sys/write.2#13 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)write.2 8.5 (Berkeley) 4/2/94 -.\" $FreeBSD: src/lib/libc/sys/write.2,v 1.32 2006/04/14 19:34:07 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/write.2,v 1.33 2006/10/21 20:36:50 simon Exp $ .\" .Dd July 7, 2005 .Dt WRITE 2 @@ -85,7 +85,7 @@ For .Fn writev and -.Fn pwritev, +.Fn pwritev , the .Fa iovec structure is defined as: ==== //depot/projects/ia64/lib/libvgl/vgl.3#7 (text+ko) ==== @@ -24,7 +24,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/lib/libvgl/vgl.3,v 1.30 2005/02/13 23:45:48 ru Exp $ +.\" $FreeBSD: src/lib/libvgl/vgl.3,v 1.31 2006/10/21 15:12:36 maxim Exp $ .Dd November 7, 1999 .Dt VGL 3 .Os @@ -398,7 +398,7 @@ .Pp .Dl VGLSetVScreenSize(10000, 10000); .Pp -.Fn VGLPanSreen +.Fn VGLPanScreen change the origin of the displayed screen in the virtual screen. Note that this function must be called when our vty is in the foreground. ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#163 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The &os; Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.980 2006/10/14 13:46:00 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.981 2006/10/21 14:06:34 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -1663,7 +1663,7 @@ to v394. &merged;</para> <para><application>libpcap</application> has been updated from - 0.9.1 to 0.9.4</para> + 0.9.1 to 0.9.4. &merged;</para> <para><application>lukemftpd</application> has been updated from a snapshot from NetBSD as of 9 August 2004 to a snapshot from @@ -1683,7 +1683,7 @@ 8.13.4 to 8.13.8. &merged;</para> <para><application>tcpdump</application> has been updated from - 3.9.1 to 3.9.4</para> + 3.9.1 to 3.9.4. &merged;</para> <para>The timezone database has been updated from the <application>tzdata2005l</application> release to the ==== //depot/projects/ia64/sbin/devd/devd.conf.5#9 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/devd/devd.conf.5,v 1.9 2006/10/07 21:15:40 jmg Exp $ +.\" $FreeBSD: src/sbin/devd/devd.conf.5,v 1.10 2006/10/21 17:15:11 ru Exp $ .\" .\" The section on comments was taken from named.conf.5, which has the .\" following copyright: @@ -84,7 +84,7 @@ substatements are explained below. .Pp Each statement, except -.Dq options +.Ic options has a priority (an arbitrary number) associated with it, where .Ql 0 is defined as the lowest priority. @@ -102,209 +102,212 @@ substatement "value"; }; .Ed -.Pp .Ss Sub-statements The following sub-statements are supported within the -.Dq options +.Ic options statement. .Bl -tag -width ".Ic directory" -.It Ic directory \*q/some/path\*q; +.It Ic directory Qq Ar /some/path ; Adds the given directory to the list of directories from which .Xr devd 8 will read -configuration files. Any number of -.Dq directory +configuration files. +Any number of +.Ic directory statements can be used. -.It Ic pid-file \*q/var/run/devd.pid\*q; -Specifies pid file. -.It Ic set regexp-name \*q(some|regexp)\*q; +.It Ic pid-file Qq Pa /var/run/devd.pid ; +Specifies PID file. +.It Ic set Ar regexp-name Qq Ar (some|regexp) ; Creates a regular expression and assigns it to the variable -.Va regexp-name . +.Ar regexp-name . The variable is avaiable throughout the rest of the configuration file. All regular expressions have an implicit -.Ql Li ^$ +.Ql ^$ around them. .El .Pp The following sub-statements are supported within the -.Dq attach +.Ic attach and -.Dq detach +.Ic detach statements. .Bl -tag -width ".Ic directory" -.It Ic action \*qcommand\*q; +.It Ic action Qq Ar command ; Command to execute upon a successful match. Example -.Ic /etc/pccard_ether $device-name start -.It Ic class \*qstring\*q; +.Dq Li "/etc/pccard_ether $device-name start" . +.It Ic class Qq Ar string ; This is shorthand for -.Dq match \*qclass\*q . -.It Ic device-name \*qstring\*q; +.Dq Ic match Qo Li class Qc Qq Ar string . +.It Ic device-name Qq string ; This is shorthand for -.Dq match \*qdevice-name\*q . +.Dq Ic match Qo Li device-name Qc Qq Ar string . This matches a device named -.Va string ; +.Ar string , which is allowed to be a regular expression or a variable previously created containing a regular expression. The -.Va device-name +.Dq Li device-name variable -is avaiable for later use with the action-statement. -.It Ic match \*qvariable\*q \*qvalue\*q; +is available for later use with the +.Ic action +statement. +.It Ic match Qo Ar variable Qc Qq Ar value ; Matches the content of -.Va value +.Ar value against -.Va variable , +.Ar variable ; the content of -.Va value +.Ar value may be a regular expression. Not required during -.Dq Li attach +.Ic attach nor -.Dq Li detach +.Ic detach events since the -.Dq Li device-name +.Ic device-name statement takes care of all device matching. For a partial list of variables, see below. -.It Ic media-type \*qstring\*q; +.It Ic media-type Qq Ar string ; This is shorthand for -.Dq match \*qdevice-name\*q . -.It Ic subdevice \*qstring\*q; +.Dq Ic match Qo Li device-name Qc Qq Ar string . +.It Ic subdevice Qq Ar string ; This is shorthand for -.Dq match \*qsubdevice\*q . +.Dq Ic match Qo Li subdevice Qc Qq Ar string . .El .Pp The following sub-statements are supported within the -.Dq nomatch +.Ic nomatch statement. .Bl -tag -width ".Ic directory" -.It Ic action \*qcommand\*q; +.It Ic action Qq Ar command ; Same as above. -.It Ic match \*qvariable\*q \*qvalue\*q; +.It Ic match Qo Ar variable Qc Qq Ar value ; Matches the content of -.Va value +.Ar value against -.Va variable , +.Ar variable ; the content of -.Va value +.Ar value may be a regular expression. For a partial list of variables, see below. .El .Pp The following sub-statements are supported within the -.Dq notify +.Ic notify statement. The .Dq Li notify variable is avaiable inside this statement and contains, a value, depending on which system and subsystem that delivered the event. .Bl -tag -width ".Ic directory" -.It Ic action \*qcommand\*q; -Command to execute upon a successful match. Example -.Ic /etc/rc.d/power_profile $notify -.It Ic match \*qsystem|subsystem|type|notify\*q \*qvalue\*q; +.It Ic action Qq Ar command ; +Command to execute upon a successful match. +Example +.Dq Li "/etc/rc.d/power_profile $notify" . +.It Ic match Qo Ar system | subsystem | type | notify Qc Qq Ar value ; Any number of -.Dq match -statements can exists within a -.Dq notify -statement. -.Va value +.Ic match +statements can exist within a +.Ic notify +statement; +.Ar value can be either a fixed string or a regular expression. Below is a list of avaiable systems, subsystems, and types. .El .Ss Variables that can be used with the match statement A partial list of variables and their possible values that can be used together with the -.Dq match +.Ic match statement. .Pp -.Bl -tag -width "manufacturer" -compact +.Bl -tag -width ".Li manufacturer" -compact .It Ic Variable .Ic Description -.It bus -Device name of parent bus -.It cisproduct -CIS-product -.It cisvendor -CIS-vendor -.It class -Device class -.It device -Device ID -.It device-name -Name of attached/detached device -.It function -Card functions -.It manufacturer -Manufacturer ID (pccard) -.It notify +.It Li bus +Device name of parent bus. +.It Li cisproduct +CIS-product. +.It Li cisvendor +CIS-vendor. +.It Li class +Device class. +.It Li device +Device ID. +.It Li device-name +Name of attached/detached device. +.It Li function +Card functions. +.It Li manufacturer +Manufacturer ID (pccard). +.It Li notify Match the value of the .Dq Li notify variable. -.It product -Product ID (pccard) -.It serial -Serial Number (USB) -.It slot -Card slot -.It subvendor -Sub-vendor ID -.It subdevice -Sub-device ID -.It subsystem -Matches a subsystem of a system, see below -.It system -Matches a system type, see below -.It type -Type of notification, see below -.It vendor -Vendor ID +.It Li product +Product ID (pccard). +.It Li serial +Serial Number (USB). +.It Li slot +Card slot. +.It Li subvendor +Sub-vendor ID. +.It Li subdevice +Sub-device ID. +.It Li subsystem +Matches a subsystem of a system, see below. +.It Li system +Matches a system type, see below. +.It Li type +Type of notification, see below. +.It Li vendor +Vendor ID. .El .Ss Notify matching -A Partial list of systems, subsystems, and types used within the -.Dq notify +A partial list of systems, subsystems, and types used within the +.Ic notify mechanism. .Pp -.Bl -tag -width "IFNET" -compact -.It Ic System -.It ACPI +.Bl -tag -width ".Li IFNET" -compact +.It Sy System +.It Li ACPI Events related to the ACPI subsystem. -.Bl -tag -compact -.It Ic Subsystem -.It ACAD -AC Line state ($notify=0x00 is offline, 0x01 is online). -.It Button +.Bl -tag -width ".Sy Subsystem" -compact +.It Sy Subsystem +.It Li ACAD +AC line state ($notify=0x00 is offline, 0x01 is online). +.It Li Button Button state ($notify=0x00 is power, 0x01 is sleep). -.It CMBAT +.It Li CMBAT Battery events. -.It Lid +.It Li Lid Lid state ($notify=0x00 is closed, 0x01 is open). -.It Thermal +.It Li Thermal Thermal zone events. .El .Pp -.It IFNET +.It Li IFNET Events related to the network subsystem. -.Bl -tag -compact -.It Ic Subsystem -.It [interface] +.Bl -tag -width ".Sy Subsystem" -compact +.It Sy Subsystem +.It Ar interface The .Dq subsystem is the actual name of the network interface on which the event took place. -.Bl -tag -compact -.It Ic Type -.It LINK_UP +.Bl -tag -width ".Li LINK_DOWN" -compact +.It Sy Type +.It Li LINK_UP Carrier status changed to UP. -.It LINK_DOWN +.It Li LINK_DOWN Carrier status changed to DOWN. .El .El .El .Pp A link state change to UP on the interface -.Dq fxp0 +.Dq Li fxp0 would result in the following notify event: .Bd -literal -offset indent system=IFNET, subsystem=fxp0, type=LINK_UP @@ -347,7 +350,7 @@ (slash, slash) and continue to the end of the physical line. They cannot be continued across multiple physical lines; to have one logical comment span multiple lines, each line must use the -.Dq // +.Ql // pair. For example: .Bd -literal -offset indent @@ -355,6 +358,13 @@ // is a new comment, even though it is logically // part of the previous comment. .Ed +.Sh FILES +.Bl -tag -width ".Pa /etc/devd.conf" -compact +.It Pa /etc/devd.conf +The +.Xr devd 8 +configuration file. +.El .Sh EXAMPLES .Bd -literal # @@ -408,12 +418,5 @@ The installed .Pa /etc/devd.conf has many additional examples. -.Sh FILES -.Bl -tag -width ".Pa /etc/devd.conf" -compact -.It Pa /etc/devd.conf -The -.Xr devd 8 -configuration file. -.El .Sh SEE ALSO .Xr devd 8 ==== //depot/projects/ia64/sbin/mdmfs/mdmfs.8#16 (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/mdmfs/mdmfs.8,v 1.24 2006/10/01 09:40:55 matteo Exp $ +.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.25 2006/10/21 16:02:42 ru Exp $ .\" -.Dd October 1 , 2006 +.Dd October 1, 2006 .Dt MDMFS 8 .Os .Sh NAME ==== //depot/projects/ia64/share/man/man4/if_bridge.4#11 (text+ko) ==== @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.23 2006/10/11 18:26:04 thompsa Exp $ +.\" $FreeBSD: src/share/man/man4/if_bridge.4,v 1.24 2006/10/21 18:04:20 ru Exp $ .\" .Dd October 8, 2006 .Dt IF_BRIDGE 4 @@ -81,7 +81,7 @@ The .Nm interface randomly chooses a link (MAC) address in the range reserved for -locally adminstered addresses when it is created. +locally administered addresses when it is created. The address can be changed by assigning the desired link address using .Xr ifconfig 8 . .Pp ==== //depot/projects/ia64/share/man/man4/sis.4#10 (text+ko) ==== @@ -28,9 +28,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/sis.4,v 1.22 2006/10/13 15:51:53 obrien Exp $ +.\" $FreeBSD: src/share/man/man4/sis.4,v 1.23 2006/10/21 18:04:42 ru Exp $ .\" -.Dd July 16, 2005 +.Dd October 13, 2006 .Dt SIS 4 .Os .Sh NAME ==== //depot/projects/ia64/share/man/man5/rc.conf.5#76 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.310 2006/10/15 15:55:00 ceri Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.311 2006/10/21 18:05:55 ru Exp $ .\" .Dd October 15, 2006 .Dt RC.CONF 5 @@ -1630,7 +1630,7 @@ .Pq Vt bool If set to .Dq Li YES , -run the id mapping daemon for NFS version 4. +run the ID mapping daemon for NFS version 4. .It Va idmapd_flags .Pq Vt str If @@ -3626,7 +3626,7 @@ autobridge_interfaces="bridge0" autobridge_bridge0="tap* dc0 vlan[345]" .Ed -.It mixer_enable +.It Va mixer_enable .Pq Vt bool If set to .Dq Li YES , ==== //depot/projects/ia64/share/man/man8/intro.8#8 (text+ko) ==== @@ -30,27 +30,28 @@ .\" SUCH DAMAGE. .\" .\" @(#)intro.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/share/man/man8/intro.8,v 1.11 2003/04/16 12:11:01 ru Exp $ +.\" $FreeBSD: src/share/man/man8/intro.8,v 1.12 2006/10/21 20:35:49 ru Exp $ .\" -.Dd December 11, 1993 +.Dd October 22, 2006 .Dt INTRO 8 .Os .Sh NAME .Nm intro -.Nd "introduction to system maintenance and operation commands" +.Nd "introduction to system maintenance procedures and commands" .Sh DESCRIPTION This section contains information related to system operation and maintenance. -It describes commands used to create new file systems, -.Xr newfs 8 , -verify the integrity of the file systems, -.Xr fsck 8 , -control disk usage, -.Xr edquota 8 , -maintain system backups, -.Xr dump 8 , -and recover files when disks die an untimely death, -.Xr restore 8 . +.Pp +It describes commands used to create new file systems +.Pq Xr newfs 8 , +verify the integrity of the file systems +.Pq Xr fsck 8 , +control disk usage +.Pq Xr edquota 8 , +maintain system backups +.Pq Xr dump 8 , +and recover files when disks die an untimely death +.Pq Xr restore 8 . .\" The .\" .Xr format 8 .\" manual @@ -61,11 +62,6 @@ and .Xr ftpd 8 are also described. -The -.Xr crash 8 -manual page -should be consulted to understand how to interpret system -crash dumps. .Pp All commands set an exit status. Its value may be tested @@ -77,6 +73,21 @@ .Xr sysexits 3 , or set the status to arbitrary values >0 (typically 1), but many such values are not described in the manual. +.Pp +A number of pages in this section describe general system +management topics. +.Pp +For example, the +.Xr boot 8 +manual page describes the system bootstrapping procedures, +and the +.Xr diskless 8 +manual page describes how to boot a system over a network. +The +.Xr crash 8 +manual page +should be consulted to understand how to interpret system +crash dumps. .Sh HISTORY The .Nm ==== //depot/projects/ia64/share/man/man9/zone.9#13 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/zone.9,v 1.27 2006/10/02 07:27:00 kib Exp $ +.\" $FreeBSD: src/share/man/man9/zone.9,v 1.28 2006/10/21 16:08:21 ru Exp $ .\" -.Dd July 21, 2003 +.Dd October 2, 2006 .Dt ZONE 9 .Os .Sh NAME ==== //depot/projects/ia64/sys/amd64/amd64/pmap.c#56 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.571 2006/08/14 15:39:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.572 2006/10/22 04:18:01 alc Exp $"); /* * Manages physical address maps. @@ -1665,7 +1665,7 @@ vm_page_t m; TAILQ_FOREACH(m, &vpq->pl, pageq) { - if (m->hold_count || m->busy || (m->flags & PG_BUSY)) + if (m->hold_count || m->busy) continue; TAILQ_FOREACH_SAFE(pv, &m->md.pv_list, pv_list, next_pv) { va = pv->pv_va; ==== //depot/projects/ia64/sys/boot/arm/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/sys/boot/arm/Makefile,v 1.2 2006/08/18 21:37:27 imp Exp $ +# $FreeBSD: src/sys/boot/arm/Makefile,v 1.3 2006/10/23 00:05:28 imp Exp $ -SUBDIR=at91 +SUBDIR= .include <bsd.subdir.mk> ==== //depot/projects/ia64/sys/boot/arm/at91/Makefile.inc#3 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.3 2006/08/10 18:22:56 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/Makefile.inc,v 1.4 2006/10/21 22:51:20 imp Exp $ .if !target(__at91_boot_Makefile.inc__) .PATH: ${.CURDIR}/../../../../libkern ${.CURDIR}/../../../../libkern/arm @@ -44,10 +44,10 @@ MK_TAG_LIST:=no .endif -.if defined(WITHOUT_FPGA) +.if defined(WITH_FPGA) +MK_FPGA:=yes +.else MK_FPGA:=no -.else -MK_FPGA:=yes .endif .endif ==== //depot/projects/ia64/sys/boot/arm/at91/boot0spi/main.c#3 (text) ==== @@ -21,7 +21,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/sys/boot/arm/at91/boot0spi/main.c,v 1.2 2006/08/16 23:18:07 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/boot0spi/main.c,v 1.3 2006/10/21 22:43:07 imp Exp $ */ #include "at91rm9200.h" @@ -40,12 +40,12 @@ char *addr3 = (char *)SDRAM_BASE + (3 << 20); /* Load to base + 2MB */ SPI_InitFlash(); - printf("Waiting for data\r\n"); + printf("Waiting for data\n"); while ((len = xmodem_rx(addr)) == -1) continue; - printf("\r\nDownloaded %u bytes.\r\n", len); - p_memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE * FLASH_PAGE_SIZE); - printf("Writing %u bytes to flash at %u\r\n", len, OFFSET); + printf("\nDownloaded %u bytes.\n", len); + memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE * FLASH_PAGE_SIZE); + printf("Writing %u bytes to flash at %u\n", len, OFFSET); for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { for (j = 0; j < 10; j++) { off = i + OFFSET; @@ -55,7 +55,7 @@ break; } if (j >= 10) - printf("Bad Readback at %u\r\n", i); + printf("Bad Readback at %u\n", i); } return (1); } ==== //depot/projects/ia64/sys/boot/arm/at91/bootiic/env_vars.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ * only. >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610230222.k9N2Mf1T005962>