From 5882cf7159629959a26b77f6fb5fd681ec09609d Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 20 Nov 2019 17:37:45 +0000
Subject: [PATCH] disable amd(8) by default

As of FreeBSD 10.1 the autofs(5) is available for automounting, and the
amd man page has indicated that the in-tree copy of amd is obsolete.
Disable it by default for now, with the expectation that it will be
removed before FreeBSD 13.0.

Reviewed by:	kevans
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D22460
---
 UPDATING             | 5 +++++
 share/mk/src.opts.mk | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index 963e48625a80..649ea8f5203d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -26,6 +26,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20191120:
+	The amd(8) automount daemon has been disabled by default, and will be
+	removed in the future.  As of FreeBSD 10.1 the autofs(5) is available
+	for automounting.
+
 20191107:
 	The nctgpio and wbwd drivers have been moved to the superio bus.
 	If you have one of these drivers in a kernel configuration, then
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 1376d3d2690a..d4232b497d8f 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -55,7 +55,6 @@ __<src.opts.mk>__:
 __DEFAULT_YES_OPTIONS = \
     ACCT \
     ACPI \
-    AMD \
     APM \
     AT \
     ATM \
@@ -193,6 +192,7 @@ __DEFAULT_YES_OPTIONS = \
     ZONEINFO
 
 __DEFAULT_NO_OPTIONS = \
+    AMD \
     BEARSSL \
     BSD_GREP \
     CLANG_EXTRAS \