From nobody Sun Jun 1 02:10:19 2025 X-Original-To: dev-commits-src-all@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 4b90mr1lVwz5xtFP; Sun, 01 Jun 2025 02:10:20 +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 4b90mq6NKKz3R3R; Sun, 01 Jun 2025 02:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748743820; 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=HKz+HrHWhheXzVnrKxiT/+Y7MCoxr4bKIYGV/crjx+U=; b=idWsgp4hl3oun7oa+8RY5BX+M0oo6cuEsW6VjHtow9NQPuvmn6IP4G0hcbKHmXSLnkGoi6 2PJlH6X4lgNKrV4zmPtoH9ItsLjRv0pvcvDAxgZcHF5n1nAuC+Dv7vq4D3iuff4gySPhlt S2RuVVKqeaQ3iesh6dRgncL4oad7RRxetwNGf42XBfrzSYO+OAzCHkREkfkAsgig67msOS eavZc8pNgiyrVqFcN6BH1Gz0UXsp3rPhxZCChW1ZIzW+/45bq6HTDPOKruOzTFkz+KopLX iTNXAxDXed1j4pgdVYO73olcmXBaEQTRE/YiTjpLMh7qFSLLzletbARvHLzqNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748743819; 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=HKz+HrHWhheXzVnrKxiT/+Y7MCoxr4bKIYGV/crjx+U=; b=BCrzi+bB/0pouWSFh3OWWEMLZTiTGBc+BoWpXTAIeeBV1uQ0XFY0Mm6b1NH7CtOSxLB2t0 3FXMyCSiofuhZlxHw0ghSlkaA6DRKD1D5Rb+y9ur5cYxzumLjphOzvJfcrec9cEpIMyEud xSPrfiA2q6PKLw/fd/0y48X05VjMvnXXAuP3yVcJpa/zEbUHhygOI2enyF/N81sNH6mcDP kyHnpOOlInO6F64QptH4GoOSML8OlRaLig+Mu3RXgXMiSkOCC7mjEkKoRIFxkaPFRF0pfS tmEOY8dvorh+/wfcLk0dlMbAKLH0JiPc3nZNPJS0+KBOqIlR/eeZmRQzIaANmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748743819; a=rsa-sha256; cv=none; b=f8DpIsc8BRFsaR3fqGuvTlyuLE7kByUTDu6MMJSLwxKVVWeP7IC3oTvuC/FASd/lo9IOdb rY/9SpiLJ7sPnvb2zQzudUyAw2VRt5+6BRC3NJ1zgcOfyHR3RA0iXfeU30kHgroHbIgtL3 p7R8nqWh9dPPIex9b6//lQw8B7G922raTHGG6xgr9L38+gbxhTXE9xaLm2BcYe996xW3sg NBFqB9mvi1kw7B2T4qvOJMvygs80hdflfhCVgVuFWpAgDVRlFZ8dIdfZgGH/S7ZjYsj5ny QK6tzJ7gCFnSYzCQNECJqATngvKHP9CY8mrgsbWVAvZjwkl+WvfBQ4FixTiLxA== 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 4b90mq5Lkhz13Z0; Sun, 01 Jun 2025 02:10:19 +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 5512AJl4034564; Sun, 1 Jun 2025 02:10:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5512AJx9034558; Sun, 1 Jun 2025 02:10:19 GMT (envelope-from git) Date: Sun, 1 Jun 2025 02:10:19 GMT Message-Id: <202506010210.5512AJx9034558@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: 08419bf19469 - main - don't gate ctl{d,adm} behind MK_ISCSI List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 08419bf194697d08837b0e0cd7ea30e911eec4bf Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=08419bf194697d08837b0e0cd7ea30e911eec4bf commit 08419bf194697d08837b0e0cd7ea30e911eec4bf Author: Lexi Winter AuthorDate: 2025-06-01 02:04:37 +0000 Commit: Lexi Winter CommitDate: 2025-06-01 02:08:40 +0000 don't gate ctl{d,adm} behind MK_ISCSI These are no longer specific to iSCSI; always build them. Reviewed by: kevans, jhb Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50625 --- libexec/rc/rc.d/Makefile | 8 ++++---- usr.sbin/Makefile | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index d463a0732c52..4696ef223378 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -114,6 +114,10 @@ CONFGROUPS+= CRON CRON+= cron CRONPACKAGE= cron +CONFGROUPS+= CTL +CTL= ctld +CTLPACKAGE= ctl + CONFGROUPS+= NFS NFS= lockd \ mountd \ @@ -263,10 +267,6 @@ CONFGROUPS+= ISCSI ISCSI= iscsictl \ iscsid ISCSIPACKAGE= iscsi - -CONFGROUPS+= CTL -CTL= ctld -CTLPACKAGE= ctl .endif .if ${MK_JAIL} != "no" diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 4b3223df9f1d..c361c1e5866d 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -14,6 +14,8 @@ SUBDIR= adduser \ clear_locks \ crashinfo \ cron \ + ctld \ + ctladm \ daemon \ dconschat \ devctl \ @@ -153,7 +155,7 @@ SUBDIR.${MK_INET6}+= rtsold SUBDIR.${MK_INET6}+= traceroute6 SUBDIR.${MK_INETD}+= inetd SUBDIR.${MK_IPFW}+= ipfwpcap -SUBDIR.${MK_ISCSI}+= ctladm ctld iscsid +SUBDIR.${MK_ISCSI}+= iscsid SUBDIR.${MK_JAIL}+= jail SUBDIR.${MK_JAIL}+= jexec SUBDIR.${MK_JAIL}+= jls