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

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

4 files changed, 13 insertions, 5 deletions

diff --git a/contrib/amd/scripts/ctl-amd.in b/contrib/amd/scripts/ctl-amd.in
index 665a7dd..8eefde2 100755
--- a/contrib/amd/scripts/ctl-amd.in
+++ b/contrib/amd/scripts/ctl-amd.in
@@ -4,6 +4,10 @@
 #
 # Package:	am-utils-6.0
 # Author:	Erez Zadok <ezk@cs.columbia.edu>
+#
+# chkconfig: 345 72 8
+# description: amd is the Berkeley AutoMount Daemon, used for \
+#              automatic filesystem mounting
 
 # set path
 prefix=@prefix@
@@ -90,14 +94,14 @@ case "$1" in
 
 'stop')
 	# prepend space to program name to ensure only amd process dies
+	echo "killing amd..."
 	killproc " amd"
+	wait4amd2die
 	;;
 
 'restart')
 	# kill amd, wait for it to die, then restart
-	echo "killing amd..."
 	ctl-amd stop
-	wait4amd2die
 	if [ $? != 0 ]
 	then
 		echo "NOT restarting amd!"
diff --git a/contrib/amd/scripts/ctl-hlfsd.in b/contrib/amd/scripts/ctl-hlfsd.in
index a6e97f6..e574d0d 100755
--- a/contrib/amd/scripts/ctl-hlfsd.in
+++ b/contrib/amd/scripts/ctl-hlfsd.in
@@ -4,6 +4,10 @@
 #
 # Package:	am-utils-6.0
 # Author:	Erez Zadok <ezk@cs.columbia.edu>
+#
+# chkconfig: 345 73 7
+# description: hlfsd is a daemon similar to amd, used to redirect user
+#              mail to home directory of the user
 
 # set path
 prefix=@prefix@
@@ -90,7 +94,7 @@ case "$1" in
 	echo "killing hlfsd..."
 	ctl-hlfsd stop
 	echo "Waiting for 10 seconds..."
-	sleep 10	# hope that's enough
+	sleep 10	# hope that would be enough
 	echo "Restarting hlfsd..."
 	ctl-hlfsd start
 	;;
diff --git a/contrib/amd/scripts/expn.1 b/contrib/amd/scripts/expn.1
index b2bd1b6..5795241 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: /home/muir/bin/RCS/expn,v 3.9 1995/10/02 17:51:35 muir Exp muir $
+# $Header: /src/cvsroot/am-utils-6.0/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 b2bd1b6..5bd4200 100755
--- a/contrib/amd/scripts/expn.in
+++ b/contrib/amd/scripts/expn.in
@@ -16,7 +16,7 @@ $sockaddr = 'S n a4 x8';
 # system requirements:
 # 	must have 'nslookup' and 'hostname' programs.
 
-# $Header: /home/muir/bin/RCS/expn,v 3.9 1995/10/02 17:51:35 muir Exp muir $
+# $Header: /src/cvsroot/am-utils-6.0/scripts/expn.in,v 1.1.1.1 1998/11/05 02:04:57 ezk Exp $
 
 # TODO:
 #	less magic should apply to command-line addresses