From nobody Mon May 5 15:39:44 2025 X-Original-To: dev-commits-src-main@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 4Zrm1D22pKz5vgFl; Mon, 05 May 2025 15:39:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zrm1D1PBFz43DS; Mon, 05 May 2025 15:39:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746459584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IFIyMtTIxTPIn1g2os2O/N1MOQV8wMRYEHhvZCozSEI=; b=DawccuZvTo4FzxwSuLux7T8H7DFEHyhv8GTWkYO4XmTMS1FLIJP58qABraPlgvPiCG1y7r P1WDczmP9okbdnf4EQ3/apQyt+tfq2QupyqG0/6luJB+17q/u8W1Lt2QmJZfLhK77DyDMC 2G5bLWBzQi7zNEHjxNF4C3/SMMf0KhoXfQRKJzheMQTJwF6bGRKLQhaiLh1ccJsn3ZuX6a cigQOyaBc16cR+/9b+yLIoI9AZMd7vy+zBHMBf+YsYHqBiPL8Ev0erw8ngnaVxAtVJdRqS QSxGp4Q4+PX8W8ZxZAaqmkQxAcLH5o0NL1X/gxk2iAiNwg+zdaTYTp4foJRizg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746459584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IFIyMtTIxTPIn1g2os2O/N1MOQV8wMRYEHhvZCozSEI=; b=hdmYgrkFcZdIxEUJAOXPqPjacPGi8hb52noAcBvOm3OYK8Dafojznu5Uc4PsVhG4vgsH7A GCT2MpX6+nVx2hjdD0pKie5BCXZiII5Rh0inh6qqBRiuulfAHdTyQCCH2SMWEOSC/3JlNT DiTg/dqUDEsMnVOqyuQ/f9xG66+u6bCQbh8DqQyzeJI81oG3Ak+xBe6xUnIpccDwJuH+ZX 4AEtN04pxj7y/I0iBmE09YUYeWEsjJm+4jyrQCV42vaywK/ItVqV+5Dl6PXqA5A1Gx5lcA uGNLL58KBpX2/hiifHNMuZM0pjMPCrHNyZTi1bHjx5UdTaadqsC9UZr+p5rGlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746459584; a=rsa-sha256; cv=none; b=vhLd5z76ebUq7bfnpLyVzEF8YFkuZL59ivpNdXvs0ZobSUA6MkaU7++3fajia5xbUlqqdW i8jP5a9qgRhMfUNC20zwDRP4fxcoBOJui54a7c1gwmQMZH2gQ8nl2L96O/uxgfHifYUbpl ck87bH7xbMg9ESZoXfIZS0B/wQHVAHPdQVk4egRgbHIyVsEQ5SBEZpu1ATGNt0A7emEIid CJtm29lTPTBoi/52S+N5FJovKxJ2GSdpD5RqsbTVEZ3nkEBKqFppt3TqhAQx0Rb4qQhUh1 sHKmpmTHvieLVCJyNgomzm88PSorN/e6fl9x6NhMly/bgQ9kTSesYtVRSc8xvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Zrm1D0rM4z4Kn; Mon, 05 May 2025 15:39:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 545Fdijo097296; Mon, 5 May 2025 15:39:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 545FdivF097293; Mon, 5 May 2025 15:39:44 GMT (envelope-from git) Date: Mon, 5 May 2025 15:39:44 GMT Message-Id: <202505051539.545FdivF097293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: f91d251b399a - main - rc.d: move some rc scripts to their packages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f91d251b399af2d468585668c6cf7938e80ab1b5 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=f91d251b399af2d468585668c6cf7938e80ab1b5 commit f91d251b399af2d468585668c6cf7938e80ab1b5 Author: Lexi Winter AuthorDate: 2025-05-05 15:17:27 +0000 Commit: Lexi Winter CommitDate: 2025-05-05 15:39:25 +0000 rc.d: move some rc scripts to their packages several rc.d scripts are installed by the FreeBSD-rc package, but they don't work without their respective packages installed. move these rc scripts into the appropriate packages so they're installed along with the services they start. this should be undisruptive to users since the scripts don't work without those packages installed anyway. (for this reason, do not move the Kerberos scripts, because the MIT Kerberos port uses the base rc.d scripts.) PR: 282324 Reviewed by: manu, des, bapt Approved by: des (mentor) Differential Revision: https://reviews.freebsd.org/D50137 --- libexec/rc/rc.d/Makefile | 159 ++++++++++++++++++++++++++++++----------------- 1 file changed, 103 insertions(+), 56 deletions(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 122c52be3da8..a51ad9161482 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -11,21 +11,16 @@ CONFS= DAEMON \ SERVERS \ adjkerntz \ bgfsck \ - ${_blacklistd} \ bridge \ cfumass \ cleanvar \ cleartmp \ - ctld \ ddb \ defaultroute \ devfs \ dmesg \ dumpon \ fsck \ - geli \ - geli2 \ - gptboot \ growfs \ growfs_fstab \ hostid \ @@ -44,7 +39,6 @@ CONFS= DAEMON \ linux \ local \ localpkg \ - lockd \ mixer \ motd \ mountcritlocal \ @@ -54,24 +48,13 @@ CONFS= DAEMON \ mdconfig2 \ mountd \ msgs \ - natd \ netif \ netoptions \ netwait \ - newsyslog \ - nfsclient \ - nfscbd \ - nfsd \ - nfsuserd \ - nisdomain \ ${_nscd} \ ${_opensm} \ os-release \ - pf \ - pflog \ - pfsync \ powerd \ - ppp \ pppoed \ pwcheck \ quota \ @@ -84,7 +67,6 @@ CONFS= DAEMON \ rpcbind \ rtadvd \ rtsold \ - rwho \ savecore \ securelevel \ serial \ @@ -96,11 +78,9 @@ CONFS= DAEMON \ swaplate \ sysctl \ sysctl_lastload \ - syslogd \ sysvipc \ tmp \ ugidfw \ - ${_utx} \ var \ var_run \ watchdogd @@ -117,6 +97,12 @@ CONFGROUPS+= DHCLIENT DHCLIENT= dhclient DHCLIENTPACKAGE= dhclient +CONFGROUPS+= GEOM +GEOM= geli \ + geli2 \ + gptboot +GEOMPACKAGE= geom + CONFGROUPS+= GGATED GGATED= ggated GGATEDPACKAGE= ggate @@ -129,20 +115,35 @@ CONFGROUPS+= CRON CRON+= cron CRONPACKAGE= cron -.if ${MK_NIS} != "no" -CONFS+= ypbind \ - ypldap \ - yppasswdd \ - ypserv \ - ypset \ - ypupdated \ - ypxfrd -.endif +CONFGROUPS+= NFS +NFS= nfsclient \ + nfsd \ + nfsuserd \ + nfscbd \ + lockd +NFSPACKAGE= nfs -.if ${MK_ACCT} != "no" +CONFGROUPS+= NEWSYSLOG +NEWSYSLOG= newsyslog +NEWSYSLOGPACKAGE= newsyslog + +CONFGROUPS+= SYSLOGD +SYSLOGD= syslogd +SYSLOGDPACKAGE= syslogd + +CONFGROUPS+= RCMDS +RCMDS= rwho +RCMDSPACKAGE= rcmds + +.if ${MK_ACCT} != "no" || ${MK_UTMPX} != "no" CONFGROUPS+= ACCT -ACCT+= accounting ACCTPACKAGE= acct +.if ${MK_ACCT} != "no" +ACCT+= accounting +.endif +.if ${MK_UTMPX} != "no" +ACCT+= utx +.endif .endif .if ${MK_ACPI} != "no" @@ -168,13 +169,17 @@ AUDITPACKAGE= audit .endif .if ${MK_AUTOFS} != "no" -CONFS+= automount -CONFS+= automountd -CONFS+= autounmountd +CONFGROUPS+= AUTOFS +AUTOFS= automount \ + automountd \ + autounmountd +AUTOFSPACKAGE= autofs .endif .if ${MK_BLACKLIST} != "no" -_blacklistd+= blacklistd +CONFGROUPS+= BLOCKLIST +BLOCKLIST= blacklistd +BLOCKLISTPACKAGE=blocklist .endif .if ${MK_BLUETOOTH} != "no" @@ -199,11 +204,15 @@ BSNMPPACKAGE= bsnmp .endif .if ${MK_CCD} != "no" -CONFS+= ccd +CONFGROUPS+= CCD +CCD= ccd +CCDPACKAGE= ccdconfig .endif .if ${MK_FTP} != "no" -CONFS+= ftpd +CONFGROUPS+= FTPD +FTPD= ftpd +FTPDPACKAGE= ftpd .endif .if ${MK_GSSAPI} != "no" @@ -219,28 +228,41 @@ HASTPACKAGE= hast .endif .if ${MK_INETD} != "no" -CONFS+= inetd +CONFGROUPS+= INETD +INETD= inetd +INETDPACKAGE= inetd .endif .if ${MK_IPFILTER} != "no" -CONFS+= ipfilter \ - ipfs \ - ipmon \ - ipnat \ - ippool +CONFGROUPS+= IPF +IPF= ipfilter \ + ipfs \ + ipmon \ + ipnat \ + ippool +IPFPACKAGE= ipf .endif .if ${MK_IPFW} != "no" -CONFS+= ipfw \ - dnctl +CONFGROUPS+= IPFW +IPFW= ipfw dnctl .if ${MK_NETGRAPH} != "no" -CONFS+= ipfw_netflow +IPFW+= ipfw_netflow .endif +IPFWPACKAGE= ipfw + +# natd is only built when ipfw is built +CONFGROUPS+= NATD +NATD+= natd +NATDPACKAGE= natd .endif .if ${MK_ISCSI} != "no" -CONFS+= iscsictl -CONFS+= iscsid +CONFGROUPS+= ISCSI +ISCSI= iscsictl \ + iscsid \ + ctld +ISCSIPACKAGE= iscsi .endif .if ${MK_JAIL} != "no" @@ -275,6 +297,19 @@ VAR_HEMIDAL= /var/heimdal VAR_HEMIDAL_MODE= 700 .endif +.if ${MK_NIS} != "no" +CONFGROUPS+= YP +YP= ypbind \ + ypldap \ + yppasswdd \ + ypserv \ + ypset \ + ypupdated \ + ypxfrd \ + nisdomain +YPPACKAGE= yp +.endif + .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif @@ -302,7 +337,18 @@ SSHPACKAGE= ssh .endif .if ${MK_PF} != "no" -CONFS+= ftp-proxy +CONFGROUPS+= PF +PF= pf \ + pflog \ + pfsync \ + ftp-proxy +PFPACKAGE= pf +.endif + +.if ${MK_PPP} != "no" +CONFGROUPS+= PPP +PPP= ppp +PPPPACKAGE= ppp .endif .if ${MK_ROUTED} != "no" @@ -327,10 +373,6 @@ UNBOUND+= local_unbound UNBOUNDPACKAGE= unbound .endif -.if ${MK_UTMPX} != "no" -_utx= utx -.endif - .if ${MK_VI} != "no" CONFGROUPS+= VI VI+= virecover @@ -338,8 +380,13 @@ VIPACKAGE= vi .endif .if ${MK_WIRELESS} != "no" -CONFS+= hostapd -CONFS+= wpa_supplicant +CONFGROUPS+= HOSTAPD +HOSTAPD= hostapd +HOSTAPDPACKAGE= hostapd + +CONFGROUPS+= WPA +WPA= wpa_supplicant +WPAPACKAGE= wpa .endif .if ${MK_ZFS} != "no" @@ -352,7 +399,7 @@ ZFS+= zpool ZFS+= zpoolreguid ZFS+= zpoolupgrade ZFS+= zvol -ZFSPACKAGE= rc +ZFSPACKAGE= zfs .endif .for fg in ${CONFGROUPS}