This commit was generated by cvs2svn to compensate for changes in r82794,

which included commits to RCS files with non-trunk default branches.

7 files changed, 58 insertions, 21 deletions

diff --git a/contrib/amd/scripts/am-eject.in b/contrib/amd/scripts/am-eject.in
index ed7e2d0..1f7f14d 100644
--- a/contrib/amd/scripts/am-eject.in
+++ b/contrib/amd/scripts/am-eject.in
@@ -12,7 +12,7 @@ PATH=@sbindir@:@bindir@:/usr/ucb:/usr/bin:/bin:${PATH}
 export PATH
 
 if [ $# -ne 1 ]; then
-	echo "Usage: $0 cd|fd"
+	echo "Usage: $0 cd|cdrom|fd|floppy"
 	exit 2
 fi
 
@@ -26,7 +26,7 @@ fi
 # append name of medium
 case "$1" in
   cd|fd) fs=$fs/$1;;
-  *)	 echo "Usage: $0 cd|fd"; exit 2;;
+  *)	 echo "Usage: $0 cd|cdrom|fd|floppy"; exit 2;;
 esac
 
 # is the medium mounted?
@@ -47,6 +47,7 @@ else
 fi
 
 case $1 in
-  cd)	eject;; # eject CD-ROM
-  fd)	echo "Ok to remove disk";;
+  cd|cdrom)	eject cdrom || eject ;; # eject CD-ROM
+  fd|floppy)	eject floppy || eject
+		echo "Ok to remove disk" ;;
 esac
diff --git a/contrib/amd/scripts/amd.conf-sample b/contrib/amd/scripts/amd.conf-sample
index 9a60e2d..a1c2f0d 100644
--- a/contrib/amd/scripts/amd.conf-sample
+++ b/contrib/amd/scripts/amd.conf-sample
@@ -22,6 +22,7 @@ local_domain =			cs.columbia.edu
 karch =				sun4m
 arch =				sun4
 # if you don't like autoconf picking up "sunos5" as the os-type, override it
+# (amd -O)
 os =				sos5
 # (amd -o)
 osver =				2.5.1
@@ -35,7 +36,7 @@ print_version =			yes | no
 log_file =			/var/log/amd | syslog | syslog:facility
 # NFS (RPC/UDP) retry interval, in tenths of secs (amd -t interval.counter)
 nfs_retry_interval =		8
-nfs_retransmit_counter =	110
+nfs_retransmit_counter =	11 (eleven retransmission attempts)
 # (amd -w)
 dismount_interval =		120
 # (amd -y)
@@ -43,18 +44,19 @@ nis_domain =			nisDom-CS.columbia.edu
 # (amd -x)
 log_options =			fatal,error,user,warn,info,map,stats,all
 # (amd -D)
-debug_options =		all,amq,daemon,fork,full,info,mem,mtab,str,test,trace
+debug_options =			all,amq,daemon,fork,full,hrtime,info,mem,mtab,\
+				str,readdir,test,trace,xdrtrace
 # (amd -S)
 plock =				no | yes
-# selectors on /defaults are off by default
-selectors_on_default =		yes | no
+# selectors are not recognized by default in the /defaults entry
+selectors_in_defaults =		yes | no
 # should browsable maps show number of entries to df/statfs (default=no)
 show_statfs_entries =		yes | no
 # (hpux) cluster name (amd -C)
 cluster =			???
 # LDAP (Lightweight Directory Access Protocol) options
-ldap_base =			ldap.your.domain:389
-ldap_hostports =		"ou=Marketing, o=AMD Ltd, c=US"
+ldap_base =			"ou=Marketing, o=AMD Ltd, c=US"
+ldap_hostports =		ldap.your.domain:389
 ldap_cache_seconds =		0 (default)
 ldap_cache_maxmem =		131072 (default)
 # default base name for hesiod maps
@@ -67,8 +69,11 @@ mount_type =			nfs | autofs
 search_path =			/etc/local:/etc/amdmaps:/misc/yp
 # alternate RPC program number to register with the port mapper
 portmap_program =		300019-300029
-# Use fully qualified host names
+# use fully qualified host names
 fully_qualified_hosts =		yes | no
+# force NFS version or NFS protocol
+nfs_vers =			2 | 3
+nfs_proto =			udp | tcp
 
 ##############################################################################
 # DEFINE AN AMD MOUNT POINT
diff --git a/contrib/amd/scripts/automount2amd.8 b/contrib/amd/scripts/automount2amd.8
index c1c1d8b..d9f234d 100644
--- a/contrib/amd/scripts/automount2amd.8
+++ b/contrib/amd/scripts/automount2amd.8
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 1997-1999 Erez Zadok
+.\" Copyright (c) 1997-2001 Erez Zadok
 .\" Copyright (c) 1990 Jan-Simon Pendry
 .\" Copyright (c) 1990 Imperial College of Science, Technology & Medicine
 .\" Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
 .\"
 .\"	%W% (Berkeley) %G%
 .\"
-.\" $Id: automount2amd.8,v 1.1 1999/08/16 01:16:36 ezk Exp $
+.\" $Id: automount2amd.8,v 1.2.2.1 2001/01/10 03:23:43 ezk Exp $
 .\"
 .TH AUTOMOUNT2AMD 8L "24 May 1993"
 .SH NAME
diff --git a/contrib/amd/scripts/ctl-amd.in b/contrib/amd/scripts/ctl-amd.in
index 22c3677..9b2fa26 100755
--- a/contrib/amd/scripts/ctl-amd.in
+++ b/contrib/amd/scripts/ctl-amd.in
@@ -1,13 +1,13 @@
 #!/bin/sh
 # control starting, stopping, or restarting amd.
-# usage: ctl-amd [start | stop | restart]
+# usage: ctl-amd [start|stop|status|restart|condrestart|reload]
 #
 # Package:	am-utils-6.0
 # Author:	Erez Zadok <ezk@cs.columbia.edu>
 #
 # chkconfig: - 72 28
 # description: Runs the automount daemon that mounts devices and NFS hosts \
-#              on demand.
+#	       on demand.
 # processname: amd
 # config: /etc/amd.conf
 #
@@ -85,9 +85,7 @@ fi
 
 case "$1" in
 'start')
-	#
 	# Start the amd automounter.
-	#
 	if [ -x @sbindir@/amd ]
 	then
 		# do not specify full path of amd so killproc() works
@@ -115,7 +113,37 @@ case "$1" in
 	fi
 	;;
 
+'condrestart')
+     if [ -f /var/lock/subsys/amd ]; then
+	    ctl-amd stop
+	    ctl-amd start
+	fi
+     ;;
+
+'reload')
+	amq -f
+	;;
+
+'status')
+	# run amq -v to produce status
+	pid=`amq -p 2>/dev/null`
+	if [ $? = 0 ]
+	then
+		echo "amd (pid $pid) is running..."
+	else
+		echo "amd is stopped"
+	fi
+	;;
+
+# start_msg and stop_msg are for HPUX
+'start_msg')
+	echo "Start am-utils 6.0 automounter"
+	;;
+'stop_msg')
+	echo "Stop am-utils 6.0 automounter"
+	;;
+
 *)
-	echo "Usage: @sbindir@/ctl-amd [ start | stop | restart ]"
+	echo "Usage: @sbindir@/ctl-amd [start|stop|status|restart|condrestart|reload]"
 	;;
 esac
diff --git a/contrib/amd/scripts/ctl-hlfsd.in b/contrib/amd/scripts/ctl-hlfsd.in
index ebb12b8..4712604 100755
--- a/contrib/amd/scripts/ctl-hlfsd.in
+++ b/contrib/amd/scripts/ctl-hlfsd.in
@@ -62,6 +62,9 @@ fi
 if [ -d /var/mail/. ]; then
 	maildir="/var/mail"
 	altmaildir="/var/alt_mail"
+elif [ -d /var/spool/mail/. ]; then
+	maildir="/var/spool/mail"
+	altmaildir="/var/spool/alt_mail"
 else
 	maildir="/usr/spool/mail"
 	altmaildir="/usr/spool/alt_mail"
diff --git a/contrib/amd/scripts/expn.1 b/contrib/amd/scripts/expn.1
index 5795241..7295a39 100644
--- a/contrib/amd/scripts/expn.1
+++ b/contrib/amd/scripts/expn.1
@@ -16,7 +16,7 @@ $sockaddr = 'S n a4 x8';
 # system requirements:
 # 	must have 'nslookup' and 'hostname' programs.
 
-# $Header: /src/cvsroot/am-utils-6.0/scripts/expn.1,v 1.1.1.1 1998/11/05 02:04:58 ezk Exp $
+# $Header: /proj/bank/cvsroot/am-utils/scripts/expn.1,v 1.1.1.1 1998/11/05 02:04:58 ezk Exp $
 
 # TODO:
 #	less magic should apply to command-line addresses
diff --git a/contrib/amd/scripts/expn.in b/contrib/amd/scripts/expn.in
index de48f8d..4591a4d 100755
--- a/contrib/amd/scripts/expn.in
+++ b/contrib/amd/scripts/expn.in
@@ -15,7 +15,7 @@ $SOCK_STREAM = &SOCK_STREAM;
 # system requirements:
 # 	must have 'nslookup' and 'hostname' programs.
 
-# $Header: /src/cvsroot/am-utils-6.0/scripts/expn.in,v 1.2 1999/09/18 08:38:07 ezk Exp $
+# $Header: /proj/bank/cvsroot/am-utils/scripts/expn.in,v 1.2.2.1 2000/06/14 01:58:48 ionut Exp $
 
 # TODO:
 #	less magic should apply to command-line addresses
@@ -114,7 +114,7 @@ $0 = "$av0 - lookup host FQDN and IP addr";
 ($hostname,$aliases,$type,$len,$thisaddr) = gethostbyname($name);
 
 $0 = "$av0 - parsing args";
-$usage = "Usage: $av0 [-1avwd] user[\@host] [user2[host2] ...]";
+$usage = "Usage: $av0 [-1avwd] user[\@host] [user2[\@host2] ...]";
 for $a (@ARGV) {
 	die $usage if $a eq "-";
 	while ($a =~ s/^(-.*)([1avwd])/$1/) {