PERFORCE change 130526 for review
Peter Wemm
peter at FreeBSD.org
Sat Dec 8 19:00:00 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=130526
Change 130526 by peter at peter_overcee on 2007/12/09 02:59:44
IFC @130525
Affected files ...
.. //depot/projects/hammer/ObsoleteFiles.inc#43 integrate
.. //depot/projects/hammer/bin/ed/Makefile#12 integrate
.. //depot/projects/hammer/contrib/amd/amd/amd.8#8 integrate
.. //depot/projects/hammer/contrib/amd/amq/amq.8#8 integrate
.. //depot/projects/hammer/contrib/amd/amq/pawd.1#6 integrate
.. //depot/projects/hammer/contrib/amd/fixmount/fixmount.8#9 integrate
.. //depot/projects/hammer/contrib/amd/fsinfo/fsinfo.8#9 integrate
.. //depot/projects/hammer/contrib/amd/hlfsd/hlfsd.8#8 integrate
.. //depot/projects/hammer/contrib/amd/mk-amd-map/mk-amd-map.8#6 integrate
.. //depot/projects/hammer/contrib/amd/scripts/amd.conf.5#9 integrate
.. //depot/projects/hammer/contrib/amd/wire-test/wire-test.8#6 integrate
.. //depot/projects/hammer/etc/rc.d/DAEMON#5 integrate
.. //depot/projects/hammer/etc/rc.d/LOGIN#5 integrate
.. //depot/projects/hammer/etc/rc.d/Makefile#58 integrate
.. //depot/projects/hammer/etc/rc.d/NETWORKING#13 integrate
.. //depot/projects/hammer/etc/rc.d/SERVERS#7 integrate
.. //depot/projects/hammer/etc/rc.d/accounting#9 integrate
.. //depot/projects/hammer/etc/rc.d/amd#15 integrate
.. //depot/projects/hammer/etc/rc.d/apmd#10 integrate
.. //depot/projects/hammer/etc/rc.d/bootconf.sh#6 delete
.. //depot/projects/hammer/etc/rc.d/bootparams#6 integrate
.. //depot/projects/hammer/etc/rc.d/ccd#5 integrate
.. //depot/projects/hammer/etc/rc.d/cron#7 integrate
.. //depot/projects/hammer/etc/rc.d/dhclient#20 integrate
.. //depot/projects/hammer/etc/rc.d/dmesg#5 integrate
.. //depot/projects/hammer/etc/rc.d/fsck#8 integrate
.. //depot/projects/hammer/etc/rc.d/ftp-proxy#2 integrate
.. //depot/projects/hammer/etc/rc.d/inetd#5 integrate
.. //depot/projects/hammer/etc/rc.d/ipfilter#23 integrate
.. //depot/projects/hammer/etc/rc.d/ipfs#6 integrate
.. //depot/projects/hammer/etc/rc.d/ipmon#13 integrate
.. //depot/projects/hammer/etc/rc.d/ipnat#13 integrate
.. //depot/projects/hammer/etc/rc.d/ipsec#13 integrate
.. //depot/projects/hammer/etc/rc.d/isdnd#13 integrate
.. //depot/projects/hammer/etc/rc.d/keyserv#4 integrate
.. //depot/projects/hammer/etc/rc.d/ldconfig#15 integrate
.. //depot/projects/hammer/etc/rc.d/local#6 integrate
.. //depot/projects/hammer/etc/rc.d/lockd#4 integrate
.. //depot/projects/hammer/etc/rc.d/lpd#7 integrate
.. //depot/projects/hammer/etc/rc.d/motd#8 integrate
.. //depot/projects/hammer/etc/rc.d/mountcritlocal#12 integrate
.. //depot/projects/hammer/etc/rc.d/mountcritremote#14 integrate
.. //depot/projects/hammer/etc/rc.d/mountd#11 integrate
.. //depot/projects/hammer/etc/rc.d/moused#11 integrate
.. //depot/projects/hammer/etc/rc.d/mrouted#10 integrate
.. //depot/projects/hammer/etc/rc.d/newsyslog#5 integrate
.. //depot/projects/hammer/etc/rc.d/nfsd#8 integrate
.. //depot/projects/hammer/etc/rc.d/power_profile#11 integrate
.. //depot/projects/hammer/etc/rc.d/pwcheck#4 integrate
.. //depot/projects/hammer/etc/rc.d/quota#6 integrate
.. //depot/projects/hammer/etc/rc.d/rarpd#6 integrate
.. //depot/projects/hammer/etc/rc.d/resolv#7 integrate
.. //depot/projects/hammer/etc/rc.d/root#13 integrate
.. //depot/projects/hammer/etc/rc.d/route6d#7 integrate
.. //depot/projects/hammer/etc/rc.d/routed#11 integrate
.. //depot/projects/hammer/etc/rc.d/rpcbind#8 integrate
.. //depot/projects/hammer/etc/rc.d/rtadvd#8 integrate
.. //depot/projects/hammer/etc/rc.d/rwho#4 integrate
.. //depot/projects/hammer/etc/rc.d/savecore#9 integrate
.. //depot/projects/hammer/etc/rc.d/securelevel#7 integrate
.. //depot/projects/hammer/etc/rc.d/sendmail#14 integrate
.. //depot/projects/hammer/etc/rc.d/sshd#10 integrate
.. //depot/projects/hammer/etc/rc.d/statd#3 integrate
.. //depot/projects/hammer/etc/rc.d/swap1#8 integrate
.. //depot/projects/hammer/etc/rc.d/sysctl#8 integrate
.. //depot/projects/hammer/etc/rc.d/syslogd#9 integrate
.. //depot/projects/hammer/etc/rc.d/timed#5 integrate
.. //depot/projects/hammer/etc/rc.d/tmp#7 integrate
.. //depot/projects/hammer/etc/rc.d/ugidfw#6 integrate
.. //depot/projects/hammer/etc/rc.d/var#9 integrate
.. //depot/projects/hammer/etc/rc.d/virecover#8 integrate
.. //depot/projects/hammer/etc/rc.d/ypbind#9 integrate
.. //depot/projects/hammer/etc/rc.d/yppasswdd#8 integrate
.. //depot/projects/hammer/etc/rc.d/ypserv#9 integrate
.. //depot/projects/hammer/games/fortune/datfiles/Makefile#7 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#71 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes-o.real#8 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes-o.sp.ok#2 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes.sp.ok#6 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes2-o#14 delete
.. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips#16 integrate
.. //depot/projects/hammer/games/fortune/datfiles/freebsd-tips.sp.ok#1 branch
.. //depot/projects/hammer/games/fortune/datfiles/limerick#9 integrate
.. //depot/projects/hammer/games/fortune/datfiles/limerick.sp.ok#1 branch
.. //depot/projects/hammer/games/fortune/datfiles/murphy#7 integrate
.. //depot/projects/hammer/games/fortune/datfiles/murphy-o#3 integrate
.. //depot/projects/hammer/games/fortune/datfiles/murphy.sp.ok#1 branch
.. //depot/projects/hammer/games/fortune/datfiles/startrek#10 integrate
.. //depot/projects/hammer/games/fortune/datfiles/zippy#4 integrate
.. //depot/projects/hammer/games/fortune/datfiles/zippy.sp.ok#2 integrate
.. //depot/projects/hammer/lib/libc/sys/access.2#4 integrate
.. //depot/projects/hammer/lib/libkse/thread/thr_kern.c#4 integrate
.. //depot/projects/hammer/lib/libpmc/libpmc.c#8 integrate
.. //depot/projects/hammer/release/fixit.profile#3 integrate
.. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.8#15 integrate
.. //depot/projects/hammer/sbin/newfs_msdos/newfs_msdos.8#6 integrate
.. //depot/projects/hammer/share/examples/cvsup/refuse#8 integrate
.. //depot/projects/hammer/share/examples/cvsup/refuse.README#8 integrate
.. //depot/projects/hammer/share/man/man4/aac.4#16 integrate
.. //depot/projects/hammer/share/man/man4/hwpmc.4#17 integrate
.. //depot/projects/hammer/share/man/man4/nve.4#8 integrate
.. //depot/projects/hammer/share/man/man5/hosts.equiv.5#6 integrate
.. //depot/projects/hammer/share/mk/bsd.subdir.mk#7 integrate
.. //depot/projects/hammer/sys/amd64/amd64/exception.S#48 integrate
.. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#57 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#168 integrate
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#102 integrate
.. //depot/projects/hammer/sys/amd64/include/pmc_mdep.h#3 integrate
.. //depot/projects/hammer/sys/amd64/include/specialreg.h#26 integrate
.. //depot/projects/hammer/sys/arm/arm/pmap.c#46 integrate
.. //depot/projects/hammer/sys/arm/include/pmc_mdep.h#3 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32.h#7 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_ipc.h#1 branch
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#53 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#49 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#46 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#46 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#46 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#51 integrate
.. //depot/projects/hammer/sys/conf/Makefile.amd64#23 integrate
.. //depot/projects/hammer/sys/dev/aac/aac.c#42 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_cam.c#20 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_pci.c#31 integrate
.. //depot/projects/hammer/sys/dev/aac/aacreg.h#12 integrate
.. //depot/projects/hammer/sys/dev/aac/aacvar.h#15 integrate
.. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.c#14 integrate
.. //depot/projects/hammer/sys/dev/arcmsr/arcmsr.h#4 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#83 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#10 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_arm.c#2 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#9 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#20 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#11 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ppro.c#7 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_x86.c#7 integrate
.. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#57 integrate
.. //depot/projects/hammer/sys/dev/re/if_re.c#54 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#7 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#10 integrate
.. //depot/projects/hammer/sys/geom/geom_bsd.c#30 integrate
.. //depot/projects/hammer/sys/geom/part/g_part.c#9 integrate
.. //depot/projects/hammer/sys/geom/part/g_part_bsd.c#2 integrate
.. //depot/projects/hammer/sys/i386/i386/exception.s#15 integrate
.. //depot/projects/hammer/sys/i386/i386/trap.c#58 integrate
.. //depot/projects/hammer/sys/i386/include/pmc_mdep.h#4 integrate
.. //depot/projects/hammer/sys/ia64/include/pmc_mdep.h#3 integrate
.. //depot/projects/hammer/sys/kern/kern_module.c#13 integrate
.. //depot/projects/hammer/sys/kern/kern_pmc.c#6 integrate
.. //depot/projects/hammer/sys/kern/subr_trap.c#41 integrate
.. //depot/projects/hammer/sys/net/if_var.h#45 integrate
.. //depot/projects/hammer/sys/net/route.c#28 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211.c#32 integrate
.. //depot/projects/hammer/sys/net80211/ieee80211_output.c#34 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.h#36 integrate
.. //depot/projects/hammer/sys/netinet/libalias/alias_util.c#7 integrate
.. //depot/projects/hammer/sys/netinet/sctp_output.c#20 integrate
.. //depot/projects/hammer/sys/netinet/sctp_usrreq.c#20 integrate
.. //depot/projects/hammer/sys/netinet/sctputil.c#23 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#55 integrate
.. //depot/projects/hammer/sys/netinet/tcp_var.h#49 integrate
.. //depot/projects/hammer/sys/netinet6/in6.c#28 integrate
.. //depot/projects/hammer/sys/pci/if_rlreg.h#29 integrate
.. //depot/projects/hammer/sys/powerpc/include/pmc_mdep.h#3 integrate
.. //depot/projects/hammer/sys/sparc64/include/pmc_mdep.h#3 integrate
.. //depot/projects/hammer/sys/sun4v/include/pmc_mdep.h#2 integrate
.. //depot/projects/hammer/sys/sys/disklabel.h#16 integrate
.. //depot/projects/hammer/sys/sys/param.h#99 integrate
.. //depot/projects/hammer/sys/sys/pmc.h#10 integrate
.. //depot/projects/hammer/sys/sys/pmckern.h#7 integrate
.. //depot/projects/hammer/sys/sys/pmclog.h#5 integrate
.. //depot/projects/hammer/sys/sys/ucred.h#12 integrate
.. //depot/projects/hammer/usr.bin/kdump/kdump.c#21 integrate
.. //depot/projects/hammer/usr.sbin/mtree/verify.c#9 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#8 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#16 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/create/pkg_create.1#13 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/delete/pkg_delete.1#4 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/info/pkg_info.1#12 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/search/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/pkg_install/search/pkg_search.1#1 branch
.. //depot/projects/hammer/usr.sbin/pkg_install/search/pkg_search.sh#1 branch
.. //depot/projects/hammer/usr.sbin/pkg_install/updating/pkg_updating.1#2 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/version/pkg_version.1#13 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.8#10 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#14 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.h#5 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat_log.c#9 integrate
.. //depot/projects/hammer/usr.sbin/timed/timed/timed.8#3 integrate
Differences ...
==== //depot/projects/hammer/ObsoleteFiles.inc#43 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.123 2007/11/29 21:49:08 brooks Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.124 2007/12/07 22:56:10 dougb 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,9 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20071207: Merged with fortunes-o.real
+OLD_FILES+=usr/share/games/fortune/fortunes2-o
+OLD_FILES+=usr/share/games/fortune/fortunes2-o.dat
# 20071129: Disabled static versions of libkse by default
.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no"
OLD_FILES+=usr/lib/libkse.a
==== //depot/projects/hammer/bin/ed/Makefile#12 (text+ko) ====
@@ -1,16 +1,16 @@
-# $FreeBSD: src/bin/ed/Makefile,v 1.33 2007/07/02 14:00:25 kensmith Exp $
+# $FreeBSD: src/bin/ed/Makefile,v 1.34 2007/12/09 00:14:27 marius Exp $
.include <bsd.own.mk>
PROG= ed
SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
+WARNS?= 2
LINKS= ${BINDIR}/ed ${BINDIR}/red
MLINKS= ed.1 red.1
.if !defined(RELEASE_CRUNCH)
.if ${MK_OPENSSL} != "no"
CFLAGS+=-DDES
-WARNS?= 2
DPADD= ${LIBCRYPTO}
LDADD= -lcrypto
.endif
==== //depot/projects/hammer/contrib/amd/amd/amd.8#8 (text+ko) ====
@@ -1,5 +1,5 @@
.\"
-.\" Copyright (c) 1997-2004 Erez Zadok
+.\" Copyright (c) 1997-2006 Erez Zadok
.\" Copyright (c) 1989 Jan-Simon Pendry
.\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine
.\" Copyright (c) 1989 The Regents of the University of California.
@@ -39,7 +39,7 @@
.\" %W% (Berkeley) %G%
.\"
.\" $Id: amd.8,v 1.14.2.1 2006/01/02 18:48:23 ezk Exp $
-.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.23 2007/12/05 15:59:33 obrien Exp $
+.\" $FreeBSD: src/contrib/amd/amd/amd.8,v 1.24 2007/12/07 20:16:19 ru Exp $
.\"
.Dd January 2, 2006
.Dt AMD 8
@@ -48,30 +48,24 @@
.Nm amd
.Nd automatically mount file systems
.Sh SYNOPSIS
-.Nm amd
+.Nm
.Fl H
-.Nm amd
+.Nm
.Op Fl F Ar conf_file
-.Nm amd
+.Nm
.Op Fl nprvHS
.Op Fl a Ar mount_point
.Op Fl c Ar duration
.Op Fl d Ar domain
-.Bk -words
.Op Fl k Ar kernel-arch
-.Ek
.Op Fl l Ar logfile
.Op Fl o Ar op_sys_ver
.Op Fl t Ar timeout.retransmit
-.Bk -words
.Op Fl w Ar interval
-.Ek
.Op Fl x Ar log-option
.Op Fl y Ar YP-domain
.Op Fl A Ar arch
-.Bk -words
.Op Fl C Ar cluster-name
-.Ek
.Op Fl D Ar option
.Op Fl F Ar conf_file
.Op Fl O Ar op_sys_name
@@ -82,41 +76,46 @@
.Oc
.Ar ...
.Sh DESCRIPTION
-.Nm Amd
-is a daemon that automatically mounts file systems whenever a file or directory
+The
+.Nm
+utility
+is a daemon that automatically mounts file systems
+whenever a file or directory
within that file system is accessed.
-File systems are automatically unmounted
-when they appear to be quiescent.
+File systems are automatically unmounted when they
+appear to be quiescent.
.Pp
-.Nm Amd
+The
+.Nm
+utility
operates by attaching itself as an
.Tn NFS
server to each of the specified
.Ar directories .
Lookups within the specified directories
are handled by
-.Nm amd ,
+.Nm ,
which uses the map defined by
.Ar mapname
to determine how to resolve the lookup.
-Generally, this will be a host name,
-some file system information and some mount options for the given file system.
+Generally, this will be a host name, some file system information
+and some mount options for the given file system.
.Pp
In the first form depicted above,
-.Nm amd
+.Nm
will print a short help string.
In the second form, if no options are
specified, or if the
.Fl F
is used,
-.Nm amd
+.Nm
will read configuration parameters from the file
.Ar conf_file
which defaults to
.Pa /etc/amd.conf .
The last form is described below.
.Sh OPTIONS
-.Bl -tag -width Ds
+.Bl -tag -width indent
.It Fl a Ar temporary-directory
Specify an alternative location for the real mount points.
The default is
@@ -140,55 +139,63 @@
If
.Ar logfile
is the string
-.Em syslog ,
-the log messages will be sent to the system log daemon by
+.Dq Li syslog ,
+then the log messages will be sent to the system log daemon by
.Xr syslog 3 .
-The default syslog facility used is LOG_DAEMON.
-If you wish to change it, append its name to the log file name,
-delimited by a single colon.
+The default syslog facility used is
+.Dv LOG_DAEMON .
+If you
+wish to change it, append its name to the log file name, delimited by a
+single colon.
For example, if
.Ar logfile
is the string
.Dq Li syslog:local7
then
-.Nm amd
+.Nm
will log messages via
.Xr syslog 3
-using the LOG_LOCAL7 facility (if it exists on the system).
+using the
+.Dv LOG_LOCAL7
+facility (if it exists on the system).
.It Fl n
Normalize hostnames.
The name referred to by ${rhost} is normalized relative to the
host database before being used.
The effect is to translate
-aliases into ``official'' names.
+aliases into
+.Dq official
+names.
.It Fl o Ar op_sys_ver
Override the compiled-in version number of the operating system.
-Useful when the built in version is not desired for backward
-compatibility reasons.
+Useful
+when the built in version is not desired for backward compatibility reasons.
For example, if the build in version is
-.Dq 2.5.1 ,
+.Dq Li 2.5.1 ,
you can override it to
-.Dq 5.5.1 ,
+.Dq Li 5.5.1 ,
and use older maps that were written with the latter in mind.
.It Fl p
-Print
-.Em PID .
-Outputs the process-id of
-.Nm amd
+Print PID.
+Outputs the process ID of
+.Nm
to standard output where it can be saved into a file.
.It Fl r
Restart existing mounts.
-.Nm Amd
+The
+.Nm
+utility
will scan the mount file table to determine which file systems
are currently mounted.
Whenever one of these would have
been auto-mounted,
-.Nm amd
+.Nm
.Em inherits
it.
.It Fl t Ar timeout.retransmit
-Specify the NFS timeout
-.Ar interval ,
+Specify the NFS
+.Ar timeout
+interval,
in tenths of a second, between
.Tn NFS/RPC
retries (for UDP only).
@@ -201,7 +208,10 @@
Useful defaults are supplied if either or both
values are missing.
.Pp
-Amd relies on the kernel RPC retransmit mechanism to trigger mount retries.
+The
+.Xr amd 8
+utility
+relies on the kernel RPC retransmit mechanism to trigger mount retries.
The values of these parameters change the overall retry interval.
Too long
an interval gives poor interactive response; too short an interval causes
@@ -212,13 +222,14 @@
.It Fl w Ar interval
Specify an
.Ar interval ,
-in seconds, between attempts to dismount file systems that have exceeded their
-cached times.
+in seconds, between attempts to dismount
+file systems that have exceeded their cached times.
The default is 2 minutes.
.It Fl x Ar options
Specify run-time logging options.
-The options are a comma separated list
-chosen from: fatal, error, user, warn, info, map, stats, all.
+The options are a comma separated
+list chosen from:
+.Li fatal , error , user , warn , info , map , stats , all .
.It Fl y Ar domain
Specify an alternative
.Tn NIS
@@ -231,8 +242,7 @@
support is not available.
.It Fl A Ar arch
Specifies the OS architecture.
-This is used solely to set the
-.Em ${arch}
+This is used solely to set the ${arch}
selector.
.It Fl C Ar cluster-name
Specify an alternative HP-UX cluster name to use.
@@ -240,11 +250,11 @@
Select from a variety of debug options.
Prefixing an
option with the string
-.Em no
+.Dq Li no
reverses the effect of that option.
Options are cumulative.
The most useful option is
-.Ar all .
+.Dq Li all .
.Pp
Since
.Fl D
@@ -255,7 +265,7 @@
and a fuller description is available in the program source.
.It Fl F Ar conf_file
Specify an
-.Nm amd
+.Nm
configuration file to use.
See
.Xr amd.conf 5
@@ -263,59 +273,63 @@
This configuration file is used to
specify any options in lieu of typing many of them on the command line.
The
-.Nm amd.conf
-file includes directives for every command line option amd has,
-and many more that are only available via the configuration file
-facility.
-The configuration file specified by this option is
-processed after all other options have been processed, regardless
-of the actual location of this option on the command line.
+.Xr amd.conf 5
+file includes directives for every command line option amd has, and many
+more that are only available via the configuration file facility.
+The
+configuration file specified by this option is processed after all other
+options had been processed, regardless of the actual location of this option
+on the command line.
.It Fl H
Print help and usage string.
.It Fl O Ar op_sys_name
Override the compiled-in name of the operating system.
-Useful when the built in name is not desired for backward
-compatibility reasons.
-For example, if the build in name is
-.Dq sunos5 ,
+Useful when the
+built in name is not desired for backward compatibility reasons.
+For
+example, if the build in name is
+.Dq Li sunos5 ,
you can override it to
-.Dq sos5
+.Dq Li sos5
and use older maps which were written with the latter in mind.
.It Fl S
Do not lock the running executable pages of
-.Nm amd
+.Nm
into memory.
To improve
-.Nm amd's
+.Nm Ns 's
performance, systems that support the
.Xr plock 3
call, could lock the
-.Nm amd
+.Nm
process into memory.
-This way there is less chance the operating system will
-schedule, page out, and swap the
-.Nm amd
-process as needed.
+This way there is less chance
+the operating system will schedule, page out, and swap the
+.Nm
+process as
+needed.
This tends to improve
-.Nm amd's
-performance, at the cost of reserving the memory used by the
-.Nm amd
-process
-(making it unavailable for other processes).
+.Nm Ns 's
+performance, at the cost of reserving the
+memory used by the
+.Nm
+process (making it unavailable for other processes).
If this behavior is not desired, use the
.Fl S
option.
.It Fl T Ar tag
Specify a tag to use with
.Xr amd.conf 5 .
-All Map entries tagged with tag will be processed.
+All map entries tagged with
+.Ar tag
+will be processed.
Map entries that are not tagged are always processed.
Map entries that are tagged with a tag other than
.Ar tag
will not be processed.
.El
.Sh FILES
-.Bl -tag -width /axx
+.Bl -tag -width ".Pa /etc/amd.conf"
.It Pa /.amd_mnt
directory under which file systems are dynamically mounted
.It Pa /etc/amd.conf
@@ -329,20 +343,17 @@
file system can be incredibly inefficient.
In most implementations of
.Tn NFS ,
-their interpolations are not cached by
-the kernel and each time a symbolic link is
-encountered during a
+their interpolations are not cached
+by the kernel and each time a symbolic link is encountered during a
.Em lookuppn
translation it costs an
.Tn RPC
call to the
.Tn NFS
server.
-A large improvement in real-time
+It would appear that a large improvement in real-time
performance could be gained by adding a cache somewhere.
-Replacing
-.Xr symlink 2
-with a suitable incarnation of the auto-mounter
+Replacing symlinks with a suitable incarnation of the auto-mounter
results in a large real-time speedup, but also causes a large
number of process context switches.
.Pp
@@ -357,25 +368,34 @@
.Xr amq 8 ,
.Xr mount 8 ,
.Xr umount 8
+.Pp
+.Dq am-utils
+.Xr info 1
+entry.
.Rs
-.%T Amd \- The 4.4 BSD Automounter
+.%A Erez Zadok
+.%B "Linux NFS and Automounter Administration"
+.%O ISBN 0-7821-2739-8
+.%I Sybex
+.%D 2001
.Re
.Pp
.Pa http://www.am-utils.org/
-.Pp
-.%T Linux NFS and Automounter Administration
-by Erez Zadok, ISBN 0-7821-2739-8, (Sybex, 2001).
+.Rs
+.%T Amd \- The 4.4 BSD Automounter
+.Re
.Sh HISTORY
The
-.Nm amd
+.Nm
utility first appeared in
.Bx 4.4 .
.Sh AUTHORS
.An Jan-Simon Pendry Aq jsp at doc.ic.ac.uk ,
Department of Computing, Imperial College, London, UK.
.Pp
-.An Erez Zadok Aq ezk at am-utils.org ,
-Department of Computer Science, Stony Brook University New York, USA.
+.An Erez Zadok Aq ezk at cs.sunysb.edu ,
+Computer Science Department, Stony Brook
+University, Stony Brook, New York, USA.
.Pp
Other authors and contributors to am-utils are listed in the
.Pa AUTHORS
==== //depot/projects/hammer/contrib/amd/amq/amq.8#8 (text+ko) ====
@@ -39,7 +39,7 @@
.\" %W% (Berkeley) %G%
.\"
.\" $Id: amq.8,v 1.15.2.1 2006/01/02 18:48:24 ezk Exp $
-.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.14 2007/12/05 15:59:33 obrien Exp $
+.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.16 2007/12/07 20:22:59 ru Exp $
.\"
.Dd January 2, 2006
.Dt AMQ 8
@@ -48,87 +48,105 @@
.Nm amq
.Nd automounter query tool
.Sh SYNOPSIS
-.Nm amq
-.Op Fl fmpsuvTU
+.Nm
+.Op Fl fmpsvwHTU
.Op Fl h Ar hostname
.Op Fl l Ar log_file
.Op Fl x Ar log_options
.Op Fl D Ar debug_options
-.Op Fl M Ar mountmap_entry
.Op Fl P Ar program_number
-.Op Ar directory
-.Ar ...
+.Op Oo Fl u Oc Ar directory ...
.Sh DESCRIPTION
-.Nm Amq
+The
+.Nm
+utility
provides a simple way of determining the current state of the
.Xr amd 8
program.
Communication is by
.Tn RPC .
Three modes of operation are supported by the current protocol.
-By default a list of mount points and auto-mounted file systems
-is output.
-An alternative host can be specified using the
+By default
+a list of mount points and auto-mounted file systems is output.
+An
+alternative host can be specified using the
.Fl h
option.
.Pp
-If directory names are given, as output by default,
-then per file system information is displayed.
+If
+.Ar directory
+names are given, as output by default, then per file system
+information is displayed.
.Sh OPTIONS
-.Bl -tag -width Ds
+.Bl -tag -width indent
.It Fl f
-Request automounter to flush the internal caches.
+Ask the automounter to flush the internal caches and reload all the maps.
.It Fl h Ar hostname
-Query alternate host
-.Ar hostname .
+Specify an alternate host to query.
By default the local host is used.
-In an
+In
+an
.Tn HP-UX
-cluster, the root server is queried by default, since
-that is the system on which the automounter is normally run.
+cluster, the root server is queried by default, since that is the system on
+which the automounter is normally run.
.It Fl l Ar log_file
-Tell amd to use
+Tell
+.Xr amd 8
+to use
.Ar log_file
as the log file name.
-For security reasons, this must be the same log file which
-.Nm amd
+For security reasons, this must be the same log file
+which
+.Xr amd 8
used when started.
This option is therefore only useful to
refresh
-.Nm amd Ns \'s
-open file handle on the log file, so that it can be rotated and compressed via
-daily cron jobs.
+.Nm amd Ns 's
+open file handle on the log file, so that it can be rotated
+and compressed via daily cron jobs.
.It Fl m
-Request the automounter to provide a list of mounted file systems,
-including the number of references to each file system and any error
-which occurred while mounting.
+Ask the automounter to provide a list of mounted file systems, including the
+number of references to each file system and any error which occurred while
+mounting.
.It Fl p
Return the process ID of the remote or locally running
-.Nm amd .
-Useful when you need to send a signal to the local
-.Nm amd
-process, and would rather not have to search through the process table.
-This
-option is used in the
+.Xr amd 8 .
+Useful when you
+need to send a signal to the local
+.Xr amd 8
+process, and would rather not have to
+search through the process table.
+This option is used in the
.Pa ctl-amd
script.
.It Fl s
-Request the automounter to provide system-wide mount statistics.
+Ask the automounter to provide system-wide mount statistics.
.It Fl u
-Request the automounter to unmount the named file systems
-instead of providing information about them.
-Unmounts are requested,
-not forced.
-They merely cause the mounted file system to timeout,
-which will be picked up by
-.Nm amd Ns \'s
+Ask the automounter to unmount the file systems named in
+.Ar directory
+instead of providing
+information about them.
+Unmounts are requested, not forced.
+They merely
+cause the mounted file system to timeout, which will be picked up by
+.Nm amd Ns 's
main scheduler thus causing the normal timeout action to be taken.
.It Fl v
-Request the automounter to provide version information.
-This is a subset
-of the information provided by
-.Nm amd Ns \'s Fl v
+Ask the automounter for its version information.
+This is a subset of the
+information output by
+.Xr amd 8 Ns 's
+.Fl v
option.
+.It Fl w
+Translate a full pathname as returned by
+.Xr getcwd 3
+into a short
+.Xr amd 8
+pathname that goes through its mount points.
+This option requires that
+.Xr amd 8
+is running.
.It Fl x Ar log_options
Ask the automounter to use the logging options specified in
.Ar log_options
@@ -137,109 +155,113 @@
Ask the automounter to use the debugging options specified in
.Ar debug_options
from now on.
-.It Fl M
-Pass a mount map entry to
-.Nm amd
-and wait for it to be evaluated, possibly causing a mount.
-This option is highly insecure.
-By default,
-.Nm amd
-and
-.Nm amq
-do not support it.
-It is necessary to configure
-.Nm am-utils
-with
-.Ar --enable-amq-mount
-to enable this option.
+.It Fl H
+Display short usage message.
.It Fl P Ar program_number
Contact an alternate running
-.Nm amd
-that had registered itself on a different RPC
+.Xr amd 8
+that had registered itself on a different
+.Tn RPC
.Ar program_number
and apply all other operations to that instance of the automounter.
-This is useful when running multiple copies of
-.Nm amd ,
-and need to manage each one separately.
+This is
+useful when you run multiple copies of
+.Xr amd 8 ,
+and need to manage each
+one separately.
If not specified,
-.Nm amq
+.Nm
will use the default program number for
-.Nm amd ,
+.Xr amd 8 ,
300019.
For security reasons, the only alternate program numbers
-.Nm amd
+.Xr amd 8
can use range from 300019 to 300029, inclusive.
.It Fl T
Contact
-.Nm amd
+.Xr amd 8
using the TCP transport only.
Normally
-.Nm amq
-will try TCP, and if that fails, will try UDP.
+.Nm
+will try TCP, and if that failed, will try UDP.
.It Fl U
Contact
-.Nm amd
+.Xr amd 8
using UDP (connectionless) transport only.
Normally
-.Nm amq
-will try TCP, and if that fails, will try UDP.
+.Nm
+will try TCP, and if that failed, will try UDP.
.El
.Sh FILES
-.Bl -tag -width amq.x -compact
+.Bl -tag -width ".Pa amq.x" -compact
.It Pa amq.x
.Tn RPC
protocol description.
.El
.Sh CAVEATS
-.Nm Amq
+The
+.Nm
+utility
uses a Sun registered
.Tn RPC
program number (300019 decimal) which may not
be in the
-.Pa /etc/rpc
+.Xr rpc 5
database.
.Pp
If the TCP wrappers library is available, and the
-.It use_tcpwrappers
+.Va use_tcpwrappers
global
-.It amd.conf
+.Xr amd.conf 5
option is set to
-.Qq yes ,
+.Dq Li yes ,
then
-.Nm Amd
+.Xr amd 8
will verify that the host running
-.Nm Aamq
+.Nm
is authorized to connect.
The
-.Nm Amd
-service name must used in the
+.Dq Li amd
+service name must be used in the
.Pa /etc/hosts.allow
and
.Pa /etc/hosts.deny
files.
For example, to allow only localhost to connect to
-.Nm Amd ,
+.Xr amd 8 ,
add this line to
.Pa /etc/hosts.allow :
-.Bd -literal
-.nf
- amd: localhost
-.fi
-.Ed
+.Pp
+.Dl "amd: localhost"
.Pp
and this line to
.Pa /etc/hosts.deny :
-.Bd -literal
-.nf
- amd: ALL
-.fi
-.Ed
+.Pp
+.Dl "amd: ALL"
.Sh SEE ALSO
.Xr amd.conf 5 ,
.Xr hosts_access 5 ,
.Xr amd 8
+.Pp
+.Dq am-utils
+.Xr info 1
+entry.
+.Rs
+.%A Erez Zadok
+.%B "Linux NFS and Automounter Administration"
+.%O ISBN 0-7821-2739-8
+.%I Sybex
+.%D 2001
+.Re
+.Pp
+.Pa http://www.am-utils.org/
+.Rs
+.%T Amd \- The 4.4 BSD Automounter
+.Re
.Sh HISTORY
-.Nm Amq
+The
+.Nm
+utility
first appeared in
.Bx 4.4 .
.Sh AUTHORS
@@ -247,8 +269,10 @@
Department of Computing, Imperial College, London, UK.
.Pp
.An Erez Zadok Aq ezk at cs.sunysb.edu ,
+Computer Science Department, Stony Brook
+University, Stony Brook, New York, USA.
.Pp
-.An Other authors and contributors to
+Other authors and contributors to
.Nm am-utils
are listed in the
.Pa AUTHORS
==== //depot/projects/hammer/contrib/amd/amq/pawd.1#6 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list