From nobody Mon Jun 17 04:59:12 2024 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 4W2d2m3pFXz5NJmb; Mon, 17 Jun 2024 04:59:12 +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 4W2d2m38ZWz3yJJ; Mon, 17 Jun 2024 04:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718600352; 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=36rIPS5YHYu+4HTKZ0FXkTIZMNh7ilIg3kY+uLw/8Eg=; b=IPkSR7qUoNfmSTCx1eIuyocNNGbDhUHgflTY756UhgNRIJNYq3c94OhiR+6TILeyDsjf/4 WNBMfXrnjyR4eu7a2CxSMZn7a5XaFNnZuPPLw5SxXYsw+y+/2Q6hFOCQ6F10cRVTvqtJzk VDnyYCMdKVDK81Z3CsukNq69VEuLAD3CpMe6Flohp3ktKfYdwWJucM0IxhOPTX+FVryH9y DxTCkkl7mV5BkSPTqb/thmg8YcwATRHqD/tU1dU1/3edaSEBlziMRYgGbwSrGQ605GEqgH HrlLeghw3hNJTrY6IS8/iKUsZrwcuVoTQCJfJtDwY0DTG4iQHo6CfGnn1e5i0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718600352; a=rsa-sha256; cv=none; b=kcM2ZP2iWmRMKCSRrJCxnAVaPsxL0dMOeJjKHbRw6s4Mo3G6UMk78zyg33MsZLDJoKexxx 4zkN/Vn3EYhFocMiLHVqjPTA14JgAlxwU3LkY1HvUKd3oKf++KF2COHLqoJl3yieNj+aRT /PCvLDmPnEaXxNtxJt+Oc4mJ4nwaawDymIzx/1Y8KUrjGJd8Ytay+Y/M3rwiwd6LQ2KZTe 00DQmNZlzwKrrlc/Yjs1rOz3vMpD70RYZDNOpDkNgkUaZFw3c6nP7BgFzK9bXdhRLYUXue Rx2EGUj0HpAST0eTVTj3WWuX/Yr4w/xxFIZXtE560Rrz8bb2VbwhbOJb8yyeXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718600352; 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=36rIPS5YHYu+4HTKZ0FXkTIZMNh7ilIg3kY+uLw/8Eg=; b=VNBZ5OXeI5VqJUku5T5ecqhng2Nvps39ath0Y0ZWIWmhzR9AFZMzOOCXFcO2KCh31RlVu3 6v25Gdh83ua1A+MgeFXoD/vAJBmdv4breUVilbqZobZYIfV5qQCQQFLlDBzkA6tu0/tj5K Yob3kZJWiOOSMgt3s7m/8GXB6+xsNqWNdp9eFo39M0BSXONiFH4zv001GK3JqFrhv9LnuF RzPFrRjajCrizLeEYKcNQVHJYCC6momy9CQCPpQt/GA1XcD7esqU+dnppRkUlopXAkaH5H nzco51y16+0PpwSnDdr1a2JdC+btMutv/E5G+NghakFlnWNCgyRdgJHxT/AHLw== 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 4W2d2m2dn3z1Ghv; Mon, 17 Jun 2024 04:59:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45H4xCKl024707; Mon, 17 Jun 2024 04:59:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45H4xCU1024704; Mon, 17 Jun 2024 04:59:12 GMT (envelope-from git) Date: Mon, 17 Jun 2024 04:59:12 GMT Message-Id: <202406170459.45H4xCU1024704@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: efb1717d21c2 - stable/14 - rc.subr(8): MFC: introduce ${name}_offcmd 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: efb1717d21c2cc488955914cb4fe9f3683b9cbe5 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=efb1717d21c2cc488955914cb4fe9f3683b9cbe5 commit efb1717d21c2cc488955914cb4fe9f3683b9cbe5 Author: Eugene Grosbein AuthorDate: 2024-06-02 19:13:42 +0000 Commit: Eugene Grosbein CommitDate: 2024-06-17 04:57:53 +0000 rc.subr(8): MFC: introduce ${name}_offcmd New variable ${name}_offcmd may be used to supply commands executed if named service is not enabled. Previously start_precmd could be used for such a task but now rc.subr(8) does not call it if a service is not enabled. Fix devd startup script to use it instead of start_precmd. PR: 279198 Reported by: Dmitry S. Lukhtionov Tested by: Dmitry S. Lukhtionov (cherry picked from commit 32a579e4fc69a65e8901111ad5f65ec56a97dfab) (cherry picked from commit c2db3a0c7d31116028b38b426a9b139d26cbc7e5) --- libexec/rc/rc.d/devd | 7 +++---- libexec/rc/rc.subr | 25 +++++++++++++++++++++---- share/man/man8/rc.subr.8 | 4 +++- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/libexec/rc/rc.d/devd b/libexec/rc/rc.d/devd index 43fb9d5928dd..fe19abd817b4 100755 --- a/libexec/rc/rc.d/devd +++ b/libexec/rc/rc.d/devd @@ -14,7 +14,8 @@ desc="Device state change daemon" rcvar="devd_enable" command="/sbin/${name}" -start_precmd=${name}_prestart +devd_offcmd=devd_off +start_precmd=find_pidfile stop_precmd=find_pidfile find_pidfile() @@ -26,10 +27,8 @@ find_pidfile() fi } -devd_prestart() +devd_off() { - find_pidfile - # If devd is disabled, turn it off in the kernel to avoid unnecessary # memory usage. if ! checkyesno ${rcvar}; then diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 332718dc6f2c..a662b878860b 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -816,6 +816,8 @@ startmsg() # # ${name}_limits n limits(1) to apply to ${command}. # +# ${name}_offcmd n If set, run if a service is not enabled. +# # ${rc_arg}_cmd n If set, use this as the method when invoked; # Otherwise, use default command (see below) # @@ -1051,13 +1053,13 @@ run_rc_command() -a "$rc_arg" != "describe" -a "$rc_arg" != "status" ] || [ -n "${rcvar}" -a "$rc_arg" = "stop" -a -z "${rc_pid}" ]; then if ! checkyesno ${rcvar}; then - if [ -n "${rc_quiet}" ]; then - return 0 - fi + [ "$rc_arg" = "start" ] && _run_rc_offcmd + if [ -z "${rc_quiet}" ]; then echo -n "Cannot '${rc_arg}' $name. Set ${rcvar} to " echo -n "YES in /etc/rc.conf or use 'one${rc_arg}' " echo "instead of '${rc_arg}'." - return 0 + fi + return 0 fi fi @@ -1347,10 +1349,25 @@ $_cpusetcmd $command $rc_flags $command_args" # # name R/W # ------------------ +# _offcmd R # _precmd R # _postcmd R # _return W # +_run_rc_offcmd() +{ + eval _offcmd=\$${name}_offcmd + if [ -n "$_offcmd" ]; then + if [ -n "$_env" ]; then + eval "export -- $_env" + fi + debug "run_rc_command: ${name}_offcmd: $_offcmd $rc_extra_args" + eval "$_offcmd $rc_extra_args" + _return=$? + fi + return 0 +} + _run_rc_precmd() { check_required_before "$rc_arg" || return 1 diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 3e3ff8c8d1e1..3037840007a4 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd August 16, 2022 +.Dd June 2, 2024 .Dt RC.SUBR 8 .Os .Sh NAME @@ -631,6 +631,8 @@ Login class to use with .Va ${name}_limits . Defaults to .Dq Li daemon . +.It Va ${name}_offcmd +Shell commands to run if a service is not enabled. .It Va ${name}_oomprotect .Xr protect 1 .Va command