From owner-p4-projects@FreeBSD.ORG Tue Jun 14 18:29:02 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 427C316A420; Tue, 14 Jun 2005 18:29:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 020AC16A41C for ; Tue, 14 Jun 2005 18:29:01 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7BFD43D53 for ; Tue, 14 Jun 2005 18:29:00 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5EIT0hT017836 for ; Tue, 14 Jun 2005 18:29:00 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5EIT0po017833 for perforce@freebsd.org; Tue, 14 Jun 2005 18:29:00 GMT (envelope-from peter@freebsd.org) Date: Tue, 14 Jun 2005 18:29:00 GMT Message-Id: <200506141829.j5EIT0po017833@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 78539 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2005 18:29:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=78539 Change 78539 by peter@peter_daintree on 2005/06/14 18:28:27 IFC @78538 Affected files ... .. //depot/projects/hammer/bin/chflags/chflags.1#10 integrate .. //depot/projects/hammer/bin/dd/dd.1#10 integrate .. //depot/projects/hammer/bin/sh/sh.1#16 integrate .. //depot/projects/hammer/contrib/sendmail/cf/ostype/freebsd6.m4#1 branch .. //depot/projects/hammer/etc/sendmail/freebsd.mc#5 integrate .. //depot/projects/hammer/etc/sendmail/freefall.mc#2 integrate .. //depot/projects/hammer/lib/libc/gen/msgrcv.3#4 integrate .. //depot/projects/hammer/libexec/getty/ttys.5#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.1#9 integrate .. //depot/projects/hammer/sbin/camcontrol/camcontrol.8#7 integrate .. //depot/projects/hammer/sbin/devfs/devfs.8#12 integrate .. //depot/projects/hammer/sbin/dhclient/dhclient.c#2 integrate .. //depot/projects/hammer/sbin/gpt/gpt.8#9 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#24 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#43 integrate .. //depot/projects/hammer/sbin/savecore/savecore.8#8 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#57 integrate .. //depot/projects/hammer/share/man/man9/Makefile#54 integrate .. //depot/projects/hammer/share/man/man9/bus_space.9#1 branch .. //depot/projects/hammer/sys/amd64/conf/NOTES#68 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#21 integrate .. //depot/projects/hammer/sys/conf/NOTES#92 integrate .. //depot/projects/hammer/sys/conf/files.alpha#22 integrate .. //depot/projects/hammer/sys/conf/files.amd64#70 integrate .. //depot/projects/hammer/sys/conf/files.ia64#28 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/hammer/sys/dev/an/if_an.c#23 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#36 integrate .. //depot/projects/hammer/sys/dev/syscons/scgfbrndr.c#7 integrate .. //depot/projects/hammer/sys/dev/syscons/scvgarndr.c#7 integrate .. //depot/projects/hammer/sys/dev/xe/if_xe.c#21 integrate .. //depot/projects/hammer/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_alloc.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_balloc.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_bitops.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_bmap.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_extern.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_fs.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_fs_sb.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_inode.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_lookup.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_mount.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_readwrite.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_subr.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/fs.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/i386-bitops.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/inode.h#1 branch .. //depot/projects/hammer/sys/gnu/fs/ext2fs/sparc64-bitops.h#1 branch .. //depot/projects/hammer/sys/i386/conf/NOTES#70 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#49 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#37 integrate .. //depot/projects/hammer/usr.bin/find/find.1#16 integrate .. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.8#5 integrate .. //depot/projects/hammer/usr.bin/lockf/lockf.1#5 integrate .. //depot/projects/hammer/usr.bin/make/make.1#22 integrate .. //depot/projects/hammer/usr.bin/pkill/pkill.1#6 integrate .. //depot/projects/hammer/usr.bin/printf/printf.1#7 integrate .. //depot/projects/hammer/usr.bin/sed/sed.1#13 integrate .. //depot/projects/hammer/usr.bin/stat/stat.1#7 integrate .. //depot/projects/hammer/usr.bin/what/what.1#6 integrate .. //depot/projects/hammer/usr.sbin/chkgrp/chkgrp.8#5 integrate .. //depot/projects/hammer/usr.sbin/jail/jail.8#23 integrate .. //depot/projects/hammer/usr.sbin/mixer/mixer.8#7 integrate .. //depot/projects/hammer/usr.sbin/mount_portalfs/mount_portalfs.8#6 integrate .. //depot/projects/hammer/usr.sbin/mtree/mtree.8#13 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.8#15 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/extract.c#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/pkg_create.1#8 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/show.c#7 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#9 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/lib/plist.c#6 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/pkg_version.1#10 integrate .. //depot/projects/hammer/usr.sbin/vidcontrol/vidcontrol.1#5 integrate Differences ... ==== //depot/projects/hammer/bin/chflags/chflags.1#10 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.24 2005/05/14 23:23:10 dd Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.25 2005/06/14 08:25:54 ru Exp $ .\" .Dd May 14, 2005 .Dt CHFLAGS 1 @@ -148,6 +148,11 @@ .Xr stat 2 , .Xr fts 3 , .Xr symlink 7 +.Sh HISTORY +The +.Nm +command first appeared in +.Bx 4.4 . .Sh BUGS Only a limited number of utilities are .Nm @@ -165,8 +170,3 @@ aware is the .Xr pax 1 utility. -.Sh HISTORY -The -.Nm -command first appeared in -.Bx 4.4 . ==== //depot/projects/hammer/bin/dd/dd.1#10 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dd.1 8.2 (Berkeley) 1/13/94 -.\" $FreeBSD: src/bin/dd/dd.1,v 1.29 2005/04/07 20:50:38 scottl Exp $ +.\" $FreeBSD: src/bin/dd/dd.1,v 1.30 2005/06/14 08:25:54 ru Exp $ .\" .Dd August 15, 2004 .Dt DD 1 @@ -392,14 +392,6 @@ Check for (even) parity errors on a file: .Pp .Dl "dd if=file conv=pareven | cmp -x - file" -.Sh BUGS -Protection mechanisms in the -.Xr geom 4 -subsystem might prevent the super-user from writing blocks to a disk. -Instructions for temporarily disabling these protectsion mechanisms can be -found in the -.Xr geom 4 -manpage. .Sh SEE ALSO .Xr cp 1 , .Xr mt 1 , @@ -424,3 +416,11 @@ values are extensions to the .Tn POSIX standard. +.Sh BUGS +Protection mechanisms in the +.Xr geom 4 +subsystem might prevent the super-user from writing blocks to a disk. +Instructions for temporarily disabling these protectsion mechanisms can be +found in the +.Xr geom 4 +manpage. ==== //depot/projects/hammer/bin/sh/sh.1#16 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.100 2005/04/15 14:53:29 keramida Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.102 2005/06/14 08:25:00 ru Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -196,12 +196,6 @@ Enable asynchronous notification of background job completion. (UNIMPLEMENTED) -.It Fl c Li string -Read commands from the -.Ar string -operand instead of from the standard input. -Keep in mind that this option only accepts a single string as its -argument, hence multi-word strings must be quoted. .It Fl C Li noclobber Do not overwrite existing files with .Dq Li > . @@ -309,6 +303,14 @@ .El .Pp The +.Fl c +option causes the commands to be read from the +.Ar string +operand instead of from the standard input. +Keep in mind that this option only accepts a single string as its +argument, hence multi-word strings must be quoted. +.Pp +The .Fl /+o option takes as its only argument the long name of an option to be enabled or disabled. @@ -2042,14 +2044,6 @@ .Dq Li set -E ) command can be used to enable a subset of emacs-style command line editing features. -.Sh EXIT STATUS -Errors that are detected by the shell, such as a syntax error, will -cause the shell to exit with a non-zero exit status. -If the shell is not an interactive shell, the execution of the shell -file will be aborted. -Otherwise the shell will return the exit status of the last command -executed, or if the exit builtin is used with a numeric argument, it -will return the argument. .Sh ENVIRONMENT The following environment variables affect the execution of .Nm : @@ -2104,17 +2098,25 @@ section for details. .It Ev PS1 The primary prompt string, which defaults to -.Dq $ \ , +.Dq Li "$ " , unless you are the superuser, in which case it defaults to -.Dq # \ . +.Dq Li "# " . .It Ev PS2 The secondary prompt string, which defaults to -.Dq \*[Gt] \ . +.Dq Li "> " . .It Ev TERM The default terminal setting for the shell. This is inherited by children of the shell, and is used in the history editing modes. .El +.Sh EXIT STATUS +Errors that are detected by the shell, such as a syntax error, will +cause the shell to exit with a non-zero exit status. +If the shell is not an interactive shell, the execution of the shell +file will be aborted. +Otherwise the shell will return the exit status of the last command +executed, or if the exit builtin is used with a numeric argument, it +will return the argument. .Sh SEE ALSO .Xr builtin 1 , .Xr chsh 1 , @@ -2125,10 +2127,10 @@ .Xr getopt 1 , .Xr pwd 1 , .Xr test 1 , -.Xr umask 2 , .Xr vi 1 , .Xr execve 2 , .Xr getrlimit 2 , +.Xr umask 2 , .Xr editrc 5 .Sh HISTORY A ==== //depot/projects/hammer/etc/sendmail/freebsd.mc#5 (text+ko) ==== @@ -44,8 +44,8 @@ # divert(0) -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.29 2003/12/24 21:15:09 gshapiro Exp $') -OSTYPE(freebsd5) +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.30 2005/06/14 02:25:17 gshapiro Exp $') +OSTYPE(freebsd6) DOMAIN(generic) FEATURE(access_db, `hash -o -T /etc/mail/access') ==== //depot/projects/hammer/etc/sendmail/freefall.mc#2 (text+ko) ==== @@ -40,8 +40,8 @@ # divert(0)dnl -VERSIONID(`$FreeBSD: src/etc/sendmail/freefall.mc,v 1.19 2002/03/26 13:00:03 ru Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freefall.mc,v 1.20 2005/06/14 02:25:17 gshapiro Exp $') -OSTYPE(freebsd5) +OSTYPE(freebsd6) FEATURE(nullclient, hub.$m) MASQUERADE_AS(FreeBSD.org) ==== //depot/projects/hammer/lib/libc/gen/msgrcv.3#4 (text+ko) ==== @@ -28,10 +28,10 @@ .\" 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. -.\" $FreeBSD: src/lib/libc/gen/msgrcv.3,v 1.19 2004/07/02 23:52:10 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/msgrcv.3,v 1.20 2005/06/14 10:56:02 ru Exp $ .\" .\"/ -.Dd November 24, 1997 +.Dd June 15, 2005 .Dt MSGRCV 3 .Os .Sh NAME @@ -122,7 +122,7 @@ will immediately return a value of -1, and set .Va errno to -.Er EAGAIN . +.Er ENOMSG . If .Dv IPC_NOWAIT is not set, the calling process will be blocked @@ -206,7 +206,7 @@ points to an invalid address. .It Bq Er EINTR The system call was interrupted by the delivery of a signal. -.It Bq Er EAGAIN +.It Bq Er ENOMSG There is no message of the requested type available on the message queue, and .Dv IPC_NOWAIT ==== //depot/projects/hammer/libexec/getty/ttys.5#4 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)ttys.5 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/libexec/getty/ttys.5,v 1.17 2005/05/27 06:07:21 eivind Exp $ +.\" $FreeBSD: src/libexec/getty/ttys.5,v 1.18 2005/06/14 08:40:10 ru Exp $ .\" " -.Dd November 17, 1996 +.Dd May 27, 2005 .Dt TTYS 5 .Os .Sh NAME ==== //depot/projects/hammer/libexec/rtld-elf/rtld.1#9 (text+ko) ==== @@ -26,7 +26,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.1,v 1.39 2005/02/04 02:46:41 mdodd Exp $ +.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.40 2005/06/14 08:41:11 ru Exp $ .\" .Dd May 31, 2003 .Dt RTLD 1 @@ -101,12 +101,12 @@ and .Ql \&, can be used instead of a space and a newline. -This variable is parsed after +This variable is parsed after .Xr libmap.conf 5 , and will override its entries. .It Ev LD_LIBMAP_DISABLE If set, disables the use of -.Xr libmap.conf 5 +.Xr libmap.conf 5 and .Ev LD_LIBMAP . .It Ev LD_LIBRARY_PATH ==== //depot/projects/hammer/sbin/camcontrol/camcontrol.8#7 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.40 2005/03/26 05:34:54 ken Exp $ +.\" $FreeBSD: src/sbin/camcontrol/camcontrol.8,v 1.41 2005/06/14 11:24:55 ru Exp $ .\" .Dd September 14, 1998 .Dt CAMCONTROL 8 @@ -677,7 +677,7 @@ .Fl y argument, below. .It Fl r -Run in +Run in .Dq report only mode. This will report status on a format that is already running on the drive. ==== //depot/projects/hammer/sbin/devfs/devfs.8#12 (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/devfs/devfs.8,v 1.14 2005/04/20 01:56:33 jcamou Exp $ +.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.15 2005/06/14 11:24:55 ru Exp $ .\" .Dd July 1, 2002 .Dt DEVFS 8 @@ -234,6 +234,11 @@ .Fl m . The mount-point is only relevant when changing what its current ruleset is or when using one of the apply commands. +.Sh FILES +.Bl -tag -compact +.It Pa /etc/defaults/devfs.rules +.It Pa /etc/devfs.rules +.El .Sh EXAMPLES When the system boots, the only ruleset that exists is ruleset number 0; @@ -338,9 +343,6 @@ The rule numbers are preserved, but ruleset 10 may already have rules with non-conflicting numbers (these will be preserved). -.Sh FILES -.Pa /etc/defaults/devfs.rules , -.Pa /etc/devfs.rules .Sh SEE ALSO .Xr chmod 1 , .Xr jail 2 , ==== //depot/projects/hammer/sbin/dhclient/dhclient.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $OpenBSD: dhclient.c,v 1.63 2005/02/06 17:10:13 krw Exp $ */ -/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.3 2005/06/07 14:47:54 brooks Exp $ */ +/* $FreeBSD: src/sbin/dhclient/dhclient.c,v 1.4 2005/06/13 23:43:08 brooks Exp $ */ /* * Copyright 2004 Henning Brauer @@ -257,12 +257,15 @@ * state and then wait for either a link down * notification or an associate event. */ - script_init("EXPIRE", NULL); - script_write_params("old_", ifi->client->active); - if (ifi->client->alias) - script_write_params("alias_", - ifi->client->alias); - script_go(); + if (ifi->client->active != NULL) { + script_init("EXPIRE", NULL); + script_write_params("old_", + ifi->client->active); + if (ifi->client->alias) + script_write_params("alias_", + ifi->client->alias); + script_go(); + } ifi->client->state = S_INIT; break; } ==== //depot/projects/hammer/sbin/gpt/gpt.8#9 (text+ko) ==== @@ -22,7 +22,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/gpt/gpt.8,v 1.12 2005/04/24 20:08:29 des Exp $ +.\" $FreeBSD: src/sbin/gpt/gpt.8,v 1.13 2005/06/14 11:24:55 ru Exp $ .\" .Dd November 12, 2004 .Os @@ -135,12 +135,7 @@ .Cm windows as aliases for the most commonly used partition types. .\" ==== create ==== -.It Xo -.Nm -.Ic create -.Op Fl fp -.Ar device ... -.Xc +.It Nm Ic create Oo Fl fp Oc Ar device ... The .Ic create command allows the user to create a new (empty) GPT. @@ -160,12 +155,7 @@ to create only the primary table and not the backup table. This option is only useful for debugging and should not be used otherwise. .\" ==== destroy ==== -.It Xo -.Nm -.Ic destroy -.Op Fl r -.Ar device ... -.Xc +.It Nm Ic destroy Oo Fl r Oc Ar device ... The .Ic destroy command allows the user to destroy an existing, possibly not empty GPT. @@ -176,12 +166,7 @@ .Nm to destroy the table in a way that it can be recovered. .\" ==== migrate ==== -.It Xo -.Nm -.Ic migrate -.Op Fl fs -.Ar device ... -.Xc +.It Nm Ic migrate Oo Fl fs Oc Ar device ... The .Ic migrate command allows the user to migrate an MBR-based disk partitioning into a @@ -203,14 +188,10 @@ disk labels into GPT partitions by creating the GPT equivalent of a slice. .\" ==== remove ==== +.It Nm Ic remove Oo Fl a Oc .It Xo .Nm .Ic remove -.Op Fl a -.Xc -.It Xo -.Nm -.Ic remove .Op Fl b Ar number .Op Fl i Ar index .Op Fl s Ar count @@ -248,11 +229,7 @@ command accepts. This can cause multiple partitions to be removed. .\" ==== show ==== -.It Xo -.Nm -.Ic show -.Ar device ... -.Xc +.It Nm Ic show Ar device ... The .Ic show command displays the current partitioning on the listed devices and gives ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.8#24 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.93 2005/06/13 15:49:59 brueffer Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.94 2005/06/14 11:24:55 ru Exp $ .\" -.Dd November 2, 2004 +.Dd June 5, 2005 .Dt IFCONFIG 8 .Os .Sh NAME ==== //depot/projects/hammer/sbin/ipfw/ipfw.8#43 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.172 2005/06/04 19:04:31 green Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.173 2005/06/14 11:24:55 ru Exp $ .\" .Dd February 22, 2005 .Dt IPFW 8 @@ -351,7 +351,7 @@ but the same packets will have the MAC header stripped off when .Nm is invoked from -.Cm ip_input() +.Cm ip_input() or .Cm ip6_input() . .Pp @@ -816,14 +816,14 @@ .It Ar protocol : Oo Cm not Oc Ar protocol-name | protocol-number An IP protocol specified by number or name (for a complete list see -.Pa /etc/protocols ) , +.Pa /etc/protocols ) , or one of the following keywords: -.Bl -tag -width indent +.Bl -tag -width indent .It Cm ip4 | ipv4 Matches IPv4 packets. .It Cm ip6 | ipv6 Matches IPv6 packets. -.It Cm ip | all +.It Cm ip | all Matches any packet. .El .Pp ==== //depot/projects/hammer/sbin/savecore/savecore.8#8 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)savecore.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/savecore/savecore.8,v 1.24 2005/06/06 06:47:33 philip Exp $ +.\" $FreeBSD: src/sbin/savecore/savecore.8,v 1.25 2005/06/14 11:24:56 ru Exp $ .\" -.Dd September 23, 1994 +.Dd February 24, 2005 .Dt SAVECORE 8 .Os .Sh NAME ==== //depot/projects/hammer/share/man/man5/rc.conf.5#57 (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/man5/rc.conf.5,v 1.254 2005/06/08 00:15:36 brooks Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.255 2005/06/14 14:43:36 ru Exp $ .\" -.Dd April 18, 2005 +.Dd June 8, 2005 .Dt RC.CONF 5 .Os .Sh NAME @@ -988,6 +988,7 @@ possible to use something like: .Bd -literal ifconfig_wi0="DHCP WPA mode 11b" +.Ed .Pp It is also possible to rename interface by doing: .Bd -literal ==== //depot/projects/hammer/share/man/man9/Makefile#54 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.259 2005/06/10 17:16:16 hmp Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.260 2005/06/14 03:40:01 imp Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -34,6 +34,7 @@ bus_release_resource.9 \ bus_set_resource.9 \ BUS_SETUP_INTR.9 \ + bus_space.9 \ byteorder.9 \ cd.9 \ condvar.9 \ ==== //depot/projects/hammer/sys/amd64/conf/NOTES#68 (text+ko) ==== @@ -5,7 +5,7 @@ # machine independent notes, look in /sys/conf/NOTES. # # (XXX from i386:NOTES,v 1.1199) -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.34 2005/04/30 20:00:58 dwhite Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.35 2005/06/14 14:21:25 ups Exp $ # # @@ -24,8 +24,11 @@ # # Notes: # +# IPI_PREEMPTION instructs the kernel to preempt threads running on other +# CPUS if needed. Relies on the PREEMPTION option # Optional: +options IPI_PREEMPTION device atpic # Optional legacy pic support device mptable # Optional MPSPEC mptable support ==== //depot/projects/hammer/sys/boot/common/loader.8#21 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.81 2005/05/30 12:33:04 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.82 2005/06/14 08:49:14 ru Exp $ .\" -.Dd October 15, 2004 +.Dd May 27, 2005 .Dt LOADER 8 .Os .Sh NAME @@ -63,7 +63,7 @@ will probe for a console and set the .Va console variable, or set it to serial console -.Pq Dq comconsole +.Pq Dq Li comconsole if the previous boot stage used that. If multiple consoles are selected, they will be listed separated by spaces. Then, devices are probed, @@ -103,7 +103,7 @@ has not been tried, and if .Va autoboot_delay is not set to -.Dq NO +.Dq Li NO (not case sensitive), then an .Ic autoboot will be tried. @@ -115,13 +115,14 @@ Please note that historically even when .Va autoboot_delay is set to -.Dq 0 +.Dq Li 0 user will be able to interrupt autoboot process by pressing some key -on the console while kernel and modules are being loaded. In some +on the console while kernel and modules are being loaded. +In some cases such behaviour may be undesirable, to prevent it set .Va autoboot_delay to -.Dq -1 , +.Dq Li -1 , in this case .Nm will engage interactive mode only if @@ -337,7 +338,7 @@ will default to 10 seconds. .Pp If set to -.Dq NO , +.Dq Li NO , no .Ic autoboot will be automatically attempted after processing @@ -347,18 +348,18 @@ will be processed normally, defaulting to 10 seconds delay. .Pp If set to -.Dq 0 -no delay will inserted, but user still will be able to interrupt +.Dq Li 0 , +no delay will be inserted, but user still will be able to interrupt .Ic autoboot process and escape into the interactive mode by pressing some key on the console while kernel and modules are being loaded. .Pp If set to -.Dq -1 -no delay will inserted and +.Dq Li -1 , +no delay will be inserted and .Nm -will engange interactive mode only if +will engage interactive mode only if .Ic autoboot has failed for some reason. .It Va boot_askname ==== //depot/projects/hammer/sys/conf/NOTES#92 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1323 2005/06/10 08:05:11 glebius Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1324 2005/06/14 14:21:24 ups Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -216,8 +216,6 @@ # performance and increase the frequency of kernel panics by # design. If you aren't sure that you need it then you don't. # Relies on the PREEMPTION option. DON'T TURN THIS ON. -# IPI_PREEMPTION instructs the kernel to preempt threads running on other -# CPUS if needed. Relies on the PREEMPTION option # MUTEX_DEBUG enables various extra assertions in the mutex code. # SLEEPQUEUE_PROFILING enables rudimentary profiling of the hash table # used to hold active sleep queues. @@ -231,7 +229,6 @@ # WITNESS_SKIPSPIN disables the witness checks on spin mutexes. options PREEMPTION options FULL_PREEMPTION -options IPI_PREEMPTION options MUTEX_DEBUG options WITNESS options WITNESS_KDB ==== //depot/projects/hammer/sys/conf/files.alpha#22 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.120 2005/06/12 00:47:21 marcel Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.121 2005/06/14 04:16:10 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -191,6 +191,7 @@ dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/ppc/ppc.c optional ppc +dev/ppc/ppc_puc.c optional ppc puc dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/syscons/schistory.c optional sc ==== //depot/projects/hammer/sys/conf/files.amd64#70 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.68 2005/06/12 00:47:21 marcel Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.69 2005/06/14 04:16:10 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -159,6 +159,7 @@ dev/mem/memutil.c optional mem dev/nve/if_nve.c optional nve pci dev/ppc/ppc.c optional ppc +dev/ppc/ppc_puc.c optional ppc puc dev/sio/sio.c optional sio dev/sio/sio_isa.c optional sio isa dev/syscons/apm/apm_saver.c optional apm_saver apm ==== //depot/projects/hammer/sys/conf/files.ia64#28 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.79 2005/06/12 00:47:21 marcel Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.80 2005/06/14 04:16:10 marcel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -64,6 +64,7 @@ dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/ppc/ppc.c optional ppc isa +dev/ppc/ppc_puc.c optional ppc puc dev/syscons/schistory.c optional sc dev/syscons/scmouse.c optional sc dev/syscons/scterm-dumb.c optional sc ==== //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_sync.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_sync.c,v 1.1.1.1 2005/04/25 18:15:41 darrenr Exp $ */ +/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_sync.c,v 1.2 2005/06/14 09:18:26 darrenr Exp $ */ /* * Copyright (C) 1995-1998 by Darren Reed. @@ -442,21 +442,26 @@ l = get_sleep_lock(&sl_tail); err = sleep(&sl_tail, PZERO+1); + if (err) { + MUTEX_EXIT(&ipsl_mutex); + return EINTR; + } spinunlock(l); } # else /* __hpux */ # ifdef __osf__ err = mpsleep(&sl_tail, PSUSP|PCATCH, "ipl sleep", 0, &ipsl_mutex, MS_LOCK_SIMPLE); + if (err) + return EINTR; # else MUTEX_EXIT(&ipsl_mutex); err = SLEEP(&sl_tail, "ipl sleep"); + if (err) + return EINTR; + MUTEX_ENTER(&ipsl_mutex); # endif /* __osf__ */ # endif /* __hpux */ - if (err) { - MUTEX_EXIT(&ipsl_mutex); - return err; - } # endif /* SOLARIS */ } MUTEX_EXIT(&ipsl_mutex); ==== //depot/projects/hammer/sys/dev/an/if_an.c#23 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.66 2005/06/10 16:49:03 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.67 2005/06/14 14:50:40 delphij Exp $"); /* * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form. @@ -676,7 +676,7 @@ mtx_init(&sc->an_mtx, device_get_nameunit(sc->an_dev), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); - ifp = if_alloc(IFT_ETHER); + ifp = sc->an_ifp = if_alloc(IFT_ETHER); if (ifp == NULL) { printf("an%d: can not if_alloc()\n", sc->an_unit); goto fail; ==== //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#36 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.98 2005/06/10 16:49:10 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.99 2005/06/14 17:47:31 brooks Exp $"); #include "opt_bdg.h" @@ -467,6 +467,12 @@ int i; sc = device_get_softc(dev); + ifp = sc->ifp = if_alloc(IFT_ETHER); + if (ifp == NULL) { + error = ENOSPC; + goto fail; + } + ifp->if_softc = sc; mtx_init(&sc->ndis_mtx, "ndis softc lock", MTX_NETWORK_LOCK, MTX_DEF); @@ -612,12 +618,6 @@ /* Check for task offload support. */ ndis_probe_offload(sc); - ifp = sc->ifp = if_alloc(IFT_ETHER); - if (ifp == NULL) { - error = ENOSPC; - goto fail; - } - ifp->if_softc = sc; if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ==== //depot/projects/hammer/sys/dev/syscons/scgfbrndr.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.21 2005/05/29 12:47:39 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.22 2005/06/14 02:43:45 peter Exp $"); #include "opt_syscons.h" #include "opt_gfb.h" ==== //depot/projects/hammer/sys/dev/syscons/scvgarndr.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/syscons/scvgarndr.c,v 1.18 2005/05/30 18:37:25 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scvgarndr.c,v 1.19 2005/06/14 02:43:45 peter Exp $"); #include "opt_syscons.h" #include "opt_vga.h" ==== //depot/projects/hammer/sys/dev/xe/if_xe.c#21 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.54 2005/06/10 16:49:17 brooks Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/xe/if_xe.c,v 1.55 2005/06/14 17:38:36 brooks Exp $"); /* * FreeBSD device driver for Xircom CreditCard PCMCIA Ethernet adapters. The @@ -226,7 +226,7 @@ /* Initialise stuff... */ scp->dev = dev; - scp->ifp = scp->ifp = if_alloc(IFT_ETHER); + scp->ifp = if_alloc(IFT_ETHER); if (scp->ifp == NULL) return ENOSPC; scp->ifm = &scp->ifmedia; ==== //depot/projects/hammer/sys/i386/conf/NOTES#70 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1199 2005/05/24 18:31:34 mux Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1200 2005/06/14 14:21:24 ups Exp $ # # @@ -39,12 +39,15 @@ # MPTABLE_FORCE_HTT option. Do NOT use this option if you have HTT # disabled in your BIOS. # +# IPI_PREEMPTION instructs the kernel to preempt threads running on other +# CPUS if needed. Relies on the PREEMPTION option # Mandatory: device apic # I/O apic # Optional: options MPTABLE_FORCE_HTT # Enable HTT CPUs with the MP Table +options IPI_PREEMPTION # >>> TRUNCATED FOR MAIL (1000 lines) <<<