From nobody Mon Aug 15 15:19:23 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 4M5ycY0rfVz4ZFDs for ; Mon, 15 Aug 2022 15:19:25 +0000 (UTC) (envelope-from 01000182a2168e9a-41c55fda-bd84-440c-91dc-87355c4779b5-000000@amazonses.com) Received: from a8-52.smtp-out.amazonses.com (a8-52.smtp-out.amazonses.com [54.240.8.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4M5ycX3nNMz3mZD for ; Mon, 15 Aug 2022 15:19:24 +0000 (UTC) (envelope-from 01000182a2168e9a-41c55fda-bd84-440c-91dc-87355c4779b5-000000@amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=vnqrkfnvu6csdl6mwgk5t6ix3nnepx57; d=tarsnap.com; t=1660576764; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=RNuo5woY0Hya4Ls+BEvSG1DoNNh8wUdhoDYTZipE31I=; b=Wc+lvUl3seT6MItNh5TVo1hmnnVr8mjgr/Ch+gbsXnqikI7iALVollXoe5O8ES5g w6tdFuKQS4kEoZCgNyLix/79FLFmtmbv02EY5tbzJgbt3N1vWJq2Y32LrnDb/oGemtA 4JXFkFifWKpQbAppGnN7NgwQpy1PJ1fdTgzt+EuU= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw; d=amazonses.com; t=1660576764; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=RNuo5woY0Hya4Ls+BEvSG1DoNNh8wUdhoDYTZipE31I=; b=i1LTgUcvB1A/F0uwGHUYLgyBTgeJO7rr+MTr46WXhnU4EvUV3/dYgZy5uJk4fBft mzkq97YX0VuJMhK9kmNd18d5jzFdCbYRYO66pk8434oDYWTcIJ+rwr3fpedYgqDrojQ N8nNRHIOxf/ghlZtn5tP8X+hjtB4FvsFuCZi60EM= Message-ID: <01000182a2168e9a-41c55fda-bd84-440c-91dc-87355c4779b5-000000@email.amazonses.com> Date: Mon, 15 Aug 2022 15:19:23 +0000 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 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: git: c9be47b34dd8 - main - rc: add ${name}_setup script support Content-Language: en-US To: Mariusz Zaborski , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202208151442.27FEgjSd083060@gitrepo.freebsd.org> From: Colin Percival In-Reply-To: <202208151442.27FEgjSd083060@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: 1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2022.08.15-54.240.8.52 X-Rspamd-Queue-Id: 4M5ycX3nNMz3mZD X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=tarsnap.com header.s=vnqrkfnvu6csdl6mwgk5t6ix3nnepx57 header.b=Wc+lvUl3; dkim=pass header.d=amazonses.com header.s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw header.b=i1LTgUcv; dmarc=pass (policy=none) header.from=tarsnap.com; spf=pass (mx1.freebsd.org: domain of 01000182a2168e9a-41c55fda-bd84-440c-91dc-87355c4779b5-000000@amazonses.com designates 54.240.8.52 as permitted sender) smtp.mailfrom=01000182a2168e9a-41c55fda-bd84-440c-91dc-87355c4779b5-000000@amazonses.com X-Spamd-Result: default: False [-0.19 / 15.00]; FORGED_MUA_THUNDERBIRD_MSGID_UNKNOWN(2.50)[]; SUBJECT_HAS_CURRENCY(1.00)[]; NEURAL_HAM_LONG(-1.00)[-0.999]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; NEURAL_HAM_SHORT(-1.00)[-0.998]; DMARC_POLICY_ALLOW(-0.50)[tarsnap.com,none]; FORGED_SENDER(0.30)[cperciva@tarsnap.com,01000182a2168e9a-41c55fda-bd84-440c-91dc-87355c4779b5-000000@amazonses.com]; R_SPF_ALLOW(-0.20)[+ip4:54.240.0.0/18:c]; R_DKIM_ALLOW(-0.20)[tarsnap.com:s=vnqrkfnvu6csdl6mwgk5t6ix3nnepx57,amazonses.com:s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw]; MIME_GOOD(-0.10)[text/plain]; RWL_MAILSPIKE_POSSIBLE(0.00)[54.240.8.52:from]; RCVD_COUNT_ZERO(0.00)[0]; MIME_TRACE(0.00)[0:+]; FROM_NEQ_ENVFROM(0.00)[cperciva@tarsnap.com,01000182a2168e9a-41c55fda-bd84-440c-91dc-87355c4779b5-000000@amazonses.com]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[tarsnap.com:+,amazonses.com:+]; RCVD_IN_DNSWL_NONE(0.00)[54.240.8.52:from]; FROM_HAS_DN(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@FreeBSD.org]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[amazonses.com:dkim] X-ThisMailContainsUnwantedMimeParts: N Can we have rc.subr(8) updated to reflect this change? It's not at all clear to me how foo_setup is different from start_precmd. Colin Percival On 8/15/22 07:42, Mariusz Zaborski wrote: > 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 > -- Colin Percival Security Officer Emeritus, FreeBSD | The power to serve Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid