From nobody Mon Aug 15 14:42:45 2022 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 4M5xpF5STZz4Z8v5; Mon, 15 Aug 2022 14:42:45 +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 4M5xpF4NHpz3hY0; Mon, 15 Aug 2022 14:42:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660574565; 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=bze4RrWMAjWj+vq2dTJiDCL6B/AyP1BTIw3koAsRmOw=; b=RRdFshl7lOZSroj/55eRFJP1MwHij3LZz5Xs3Xnx+7k+QrlIIXmE2Y0S+8nFZo829nIthi 0ZIJvWiiVTUOPzdZBrjQujvh0yp1wFV532scxzKLleNa4TeGTJTmLWRqe4H589vPqejHIR EQBnHhkv+Im08nhzCJLC3rGA+Z9w7NMJ/AY9N5ywrtPzP9+cdW35Q63Pus7k1KFCVdTw7t zkdr56B7805vogq3U55V60m/iObpOjO8I+5rilnhfeGb041pCoz7HhKaB2hPqjIjgUeSdl TU/I+ZJK3BwjWVHZoLcArwh2cCVSRfxxCfeWPwH7bjQxFwXYV0nvbzGu8NDagQ== 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 4M5xpF3QzjzYxj; Mon, 15 Aug 2022 14:42:45 +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 27FEgjfK083061; Mon, 15 Aug 2022 14:42:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27FEgjSd083060; Mon, 15 Aug 2022 14:42:45 GMT (envelope-from git) Date: Mon, 15 Aug 2022 14:42:45 GMT Message-Id: <202208151442.27FEgjSd083060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: c9be47b34dd8 - main - rc: add ${name}_setup script support 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9be47b34dd847da1d4ab0feee4a6100b2c5ea0d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660574565; 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=bze4RrWMAjWj+vq2dTJiDCL6B/AyP1BTIw3koAsRmOw=; b=VoebvyYzDMMxNadjdfxhMz2vzcK9d5hjGV/9tlYvb/0qq4hpzQIQx5LHSkTcN+i8MOWXk4 Q1mFLStdaRZe3/mswgQghjubIZpvzWj37s0uJBJE+56bEdoDfBSZMYIm3bGh3AM2qpHQEG 5QTEA4vHD6n7yI2B4WJu9YzEmW2tSQOrnqCMg3nqrf0avEYWa/fx0jvYJt9s8jMA7+F7MJ Ayi1UdNKL1X3O3FXZJ0GBq+HsfgWSHR6oG2XJgwVOffqzYVcbbEM8OjZr3l8tg/2+k+GHI VkfM0JMD1PB0EcaqAILcd9reCYHBMxyzFIzZpoSwRlobVQ6J0PcUQ5QdMjFn2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660574565; a=rsa-sha256; cv=none; b=u3M4WXKFFmsJo8pHtm2vzZqADIh1j6YBhxfoHRpqNLmdjwENTdElfljxbzW1vjwhGCAYJS 0mK348WCUYARSoFHwwFmKw9zMKYl8IDwo3x1D5pI1fbyXwah5hHRMwXiNvBol8+M0eKu6m RBaen9oUAasl3CVK1kYu/OeNuO39C1EHwCQwH6r7VnSJkEH2QSA3dk85daZJP1Vv2vLQPB y1KtsCDLEiN/Y8Gas+pyA+MywObhL46N37Vy3uQadWul9PO5iTyhxey+DbTXylvi7BbZoT bWxZ5aFbQez3JqjmoXcWaNiJJiWOBTH0K3Ln+59p90nwdEboBrxb1+CiLsEcXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=c9be47b34dd847da1d4ab0feee4a6100b2c5ea0d commit c9be47b34dd847da1d4ab0feee4a6100b2c5ea0d Author: Franco Fichtner AuthorDate: 2022-08-15 14:41:31 +0000 Commit: Mariusz Zaborski CommitDate: 2022-08-15 14:43:12 +0000 rc: add ${name}_setup script support Run a service-based setup script before running the start command. Useful for automatic configuration file generation. Reviewed by: https://reviews.freebsd.org/D36006 --- libexec/rc/rc.subr | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 612ee12883ec..9ae93dc391a2 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -804,6 +804,8 @@ startmsg() # # ${name}_prepend n Command added before ${command}. # +# ${name}_setup n Command executed before ${command}. +# # ${name}_login_class n Login class to use, else "daemon". # # ${name}_limits n limits(1) to apply to ${command}. @@ -993,8 +995,8 @@ run_rc_command() _group=\$${name}_group _groups=\$${name}_groups \ _fib=\$${name}_fib _env=\$${name}_env \ _prepend=\$${name}_prepend _login_class=\${${name}_login_class:-daemon} \ - _limits=\$${name}_limits _oomprotect=\$${name}_oomprotect \ - _env_file=\$${name}_env_file + _limits=\$${name}_limits _oomprotect=\$${name}_oomprotect \ + _setup=\$${name}_setup _env_file=\$${name}_env_file if [ -n "$_env_file" ] && [ -r "${_env_file}" ]; then # load env from file set -a @@ -1149,6 +1151,12 @@ $command $rc_flags $command_args" fi fi + if [ -n "$_setup" ]; then + if ! _run_rc_doit "$_setup"; then + warn "failed to setup ${name}" + fi + fi + # Prepend default limits _doit="$_cd limits -C $_login_class $_limits $_doit" @@ -2187,7 +2195,7 @@ check_kern_features() # check_namevarlist var # Return "0" if ${name}_var is reserved in rc.subr. -_rc_namevarlist="program chroot chdir env flags fib nice user group groups prepend" +_rc_namevarlist="program chroot chdir env flags fib nice user group groups prepend setup" check_namevarlist() { local _v