From nobody Tue Oct 12 00:38:28 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5FE4F18080FE; Tue, 12 Oct 2021 00:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HSxbm2Cx3z4vrW; Tue, 12 Oct 2021 00:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2D40A2C3E; Tue, 12 Oct 2021 00:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19C0cSot037214; Tue, 12 Oct 2021 00:38:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19C0cSJZ037213; Tue, 12 Oct 2021 00:38:28 GMT (envelope-from git) Date: Tue, 12 Oct 2021 00:38:28 GMT Message-Id: <202110120038.19C0cSJZ037213@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 0cd2f8f6ab70 - stable/13 - Remove obsolete amd(8) rc.conf configuration List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0cd2f8f6ab700f487a78f7383465f127b24829c7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0cd2f8f6ab700f487a78f7383465f127b24829c7 commit 0cd2f8f6ab700f487a78f7383465f127b24829c7 Author: Tom Hukins AuthorDate: 2021-10-05 14:34:52 +0000 Commit: Ed Maste CommitDate: 2021-10-12 00:38:06 +0000 Remove obsolete amd(8) rc.conf configuration The script that used these was removed in 13f7dbe822d5f along with amd itself. Fixes: 13f7dbe822d5 ("retire amd(8)") MFC after: 1 week Pull Request: https://github.com/freebsd/freebsd-src/pull/548 (cherry picked from commit 70ffa69e1bc7d6acbe061315743b1407b7d722d8) --- libexec/rc/rc.conf | 4 ---- share/man/man5/rc.conf.5 | 36 +----------------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf index 89bb8e65d7b8..e4fc9a1d75fe 100644 --- a/libexec/rc/rc.conf +++ b/libexec/rc/rc.conf @@ -351,10 +351,6 @@ ftpd_program="/usr/libexec/ftpd" # Path to ftpd, if you want a different one. ftpd_flags="" # Additional flags to stand-alone ftpd. ### Network daemon (NFS): All need rpcbind_enable="YES" ### -amd_enable="NO" # Run amd service with $amd_flags (or NO). -amd_program="/usr/sbin/amd" # path to amd, if you want a different one. -amd_flags="-a /.amd_mnt -l syslog /host /etc/amd.map /net /etc/amd.map" -amd_map_program="NO" # Can be set to "ypcat -k amd.master" autofs_enable="NO" # Run autofs daemons. automount_flags="" # Flags to automount(8) (if autofs enabled). automountd_flags="" # Flags to automountd(8) (if autofs enabled). diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 5f0022ca1a78..96db269407cd 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 8, 2021 +.Dd October 5, 2021 .Dt RC.CONF 5 .Os .Sh NAME @@ -2320,39 +2320,6 @@ If is set to .Dq Li YES , these are the flags to pass to it. -.It Va amd_enable -.Pq Vt bool -If set to -.Dq Li YES , -run the -.Xr amd 8 -daemon at boot time. -.It Va amd_flags -.Pq Vt str -If -.Va amd_enable -is set to -.Dq Li YES , -these are the flags to pass to it. -See the -.Xr amd 8 -manpage for more information. -.It Va amd_map_program -.Pq Vt str -If set, -the specified program is run to get the list of -.Xr amd 8 -maps. -For example, if the -.Xr amd 8 -maps are stored in NIS, one can set this to -run -.Xr ypcat 1 -to get a list of -.Xr amd 8 -maps from the -.Pa amd.master -NIS map. .It Va update_motd .Pq Vt bool If set to @@ -4638,7 +4605,6 @@ it will be made permanently active. .Xr pf.conf 5 , .Xr security 7 , .Xr accton 8 , -.Xr amd 8 , .Xr apm 8 , .Xr bsdinstall 8 , .Xr bthidd 8 ,