From a246c358bdc531b5952e58a4ea80aa002978e3b7 Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Fri, 9 Feb 1996 12:20:40 +0000
Subject: [PATCH] Close PR conf/589 - amd should only evaluate ${amdflags}.
 While I'm at it, add a commented-out sample amd flags line to sysconfig and
 drop a sample amd.map file in this directory for easy copying. I know that
 this file's contents are highly site-variable, but the one I've chosen for an
 example is also the one I've seen on 99.9% of the amd-using sites I've
 visited.  I think it's a fair default.

---
 etc/amd.map   | 2 ++
 etc/rc        | 4 ++--
 etc/sysconfig | 7 +++++--
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 etc/amd.map

diff --git a/etc/amd.map b/etc/amd.map
new file mode 100644
index 000000000000..dfcb88b1cad0
--- /dev/null
+++ b/etc/amd.map
@@ -0,0 +1,2 @@
+/defaults       type:=host;fs:=${autodir}/${rhost};rhost:=${key}
+*               opts:=rw,grpid
diff --git a/etc/rc b/etc/rc
index 7bdac9dd3499..1bb32a7a9a7c 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.82 1996/01/28 08:08:36 gpalmer Exp $
+#	$Id: rc,v 1.83 1996/01/29 08:46:13 gpalmer Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
@@ -224,7 +224,7 @@ fi
 
 if [ "X${amdflags}" != X"NO" ]; then
 	echo -n ' amd'
-	amd -p -l /var/log/amd.log ${amdflags} > /var/run/amd.pid
+	amd ${amdflags} > /var/run/amd.pid
 fi
 
 # Kerberos runs ONLY on the Kerberos server machine
diff --git a/etc/sysconfig b/etc/sysconfig
index 4c063f27edde..a20411740982 100644
--- a/etc/sysconfig
+++ b/etc/sysconfig
@@ -4,7 +4,7 @@
 # This is sysconfig - a file full of useful variables that you can set 
 # to change the default startup behavior of your system.
 #
-#	$Id: sysconfig,v 1.33 1996/01/29 08:46:14 gpalmer Exp $
+#	$Id: sysconfig,v 1.34 1996/01/31 15:02:32 mpp Exp $
 
 ######################### Start Of Local Configuration Section ###########
 
@@ -139,8 +139,11 @@ lpd=YES
 # time in minutes.  If set to NO, don't start sendmail at all.
 sendmail_flags="-bd -q30m"
 
-# Set to appropriate flags if you want to use AMD
+# Set to appropriate flags if you want to use AMD.  The commented-out entry
+# provides a reasonable default, using the sample amd.map config file from the
+# /usr/src/etc directory.
 amdflags="NO"
+#amdflags="a /net -c 1800 -k i386 -d my.domain -l syslog /host /etc/amd.map"
 
 # Set to YES if this machine will be an NFS client
 nfs_client=NO