Date: Mon, 15 Aug 2022 17:27:17 +0200
From: Mariusz Zaborski <oshogbo@freebsd.org>
To: Colin Percival <cperciva@tarsnap.com>
Cc: franco@opnsense.org, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, dev-commits-src-main@freebsd.org
Subject: Re: git: c9be47b34dd8 - main - rc: add ${name}_setup script support
Message-ID: <CAGOYWV8v%2Bq=F2rdtHewje_Eh6NrJeNyTX%2BnbLJPwnNa1OzoKYQ@mail.gmail.com>
In-Reply-To: <01000182a2168e9f-0a342484-127b-42fc-819a-00ddbf5158db-000000@email.amazonses.com>
References: <202208151442.27FEgjSd083060@gitrepo.freebsd.org> <01000182a2168e9f-0a342484-127b-42fc-819a-00ddbf5158db-000000@email.amazonses.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] Thats a good point. cc the author On Mon, 15 Aug 2022 at 17:19, Colin Percival <cperciva@tarsnap.com> wrote: > 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 <franco@opnsense.org> > > AuthorDate: 2022-08-15 14:41:31 +0000 > > Commit: Mariusz Zaborski <oshogbo@FreeBSD.org> > > 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 > [-- Attachment #2 --] <div dir="ltr">Thats a good point.<div>cc the author</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, 15 Aug 2022 at 17:19, Colin Percival <<a href="mailto:cperciva@tarsnap.com">cperciva@tarsnap.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Can we have rc.subr(8) updated to reflect this change? It's not at all clear<br> to me how foo_setup is different from start_precmd.<br> <br> Colin Percival<br> <br> On 8/15/22 07:42, Mariusz Zaborski wrote:<br> > The branch main has been updated by oshogbo:<br> > <br> > URL: <a href="https://cgit.FreeBSD.org/src/commit/?id=c9be47b34dd847da1d4ab0feee4a6100b2c5ea0d" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=c9be47b34dd847da1d4ab0feee4a6100b2c5ea0d</a><br>; > <br> > commit c9be47b34dd847da1d4ab0feee4a6100b2c5ea0d<br> > Author: Franco Fichtner <<a href="mailto:franco@opnsense.org" target="_blank">franco@opnsense.org</a>><br> > AuthorDate: 2022-08-15 14:41:31 +0000<br> > Commit: Mariusz Zaborski <oshogbo@FreeBSD.org><br> > CommitDate: 2022-08-15 14:43:12 +0000<br> > <br> > rc: add ${name}_setup script support<br> > <br> > Run a service-based setup script before running the start command.<br> > Useful for automatic configuration file generation.<br> > <br> > Reviewed by: <a href="https://reviews.freebsd.org/D36006" rel="noreferrer" target="_blank">https://reviews.freebsd.org/D36006</a><br>; > ---<br> > libexec/rc/rc.subr | 14 +++++++++++---<br> > 1 file changed, 11 insertions(+), 3 deletions(-)<br> > <br> > diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr<br> > index 612ee12883ec..9ae93dc391a2 100644<br> > --- a/libexec/rc/rc.subr<br> > +++ b/libexec/rc/rc.subr<br> > @@ -804,6 +804,8 @@ startmsg()<br> > #<br> > # ${name}_prepend n Command added before ${command}.<br> > #<br> > +# ${name}_setup n Command executed before ${command}.<br> > +#<br> > # ${name}_login_class n Login class to use, else "daemon".<br> > #<br> > # ${name}_limits n limits(1) to apply to ${command}.<br> > @@ -993,8 +995,8 @@ run_rc_command()<br> > _group=\$${name}_group _groups=\$${name}_groups \<br> > _fib=\$${name}_fib _env=\$${name}_env \<br> > _prepend=\$${name}_prepend _login_class=\${${name}_login_class:-daemon} \<br> > - _limits=\$${name}_limits _oomprotect=\$${name}_oomprotect \<br> > - _env_file=\$${name}_env_file<br> > + _limits=\$${name}_limits _oomprotect=\$${name}_oomprotect \<br> > + _setup=\$${name}_setup _env_file=\$${name}_env_file<br> > <br> > if [ -n "$_env_file" ] && [ -r "${_env_file}" ]; then # load env from file<br> > set -a<br> > @@ -1149,6 +1151,12 @@ $command $rc_flags $command_args"<br> > fi<br> > fi<br> > <br> > + if [ -n "$_setup" ]; then<br> > + if ! _run_rc_doit "$_setup"; then<br> > + warn "failed to setup ${name}"<br> > + fi<br> > + fi<br> > +<br> > # Prepend default limits<br> > _doit="$_cd limits -C $_login_class $_limits $_doit"<br> > <br> > @@ -2187,7 +2195,7 @@ check_kern_features()<br> > # check_namevarlist var<br> > # Return "0" if ${name}_var is reserved in rc.subr.<br> > <br> > -_rc_namevarlist="program chroot chdir env flags fib nice user group groups prepend"<br> > +_rc_namevarlist="program chroot chdir env flags fib nice user group groups prepend setup"<br> > check_namevarlist()<br> > {<br> > local _v<br> > <br> <br> -- <br> Colin Percival<br> Security Officer Emeritus, FreeBSD | The power to serve<br> Founder, Tarsnap | <a href="http://www.tarsnap.com" rel="noreferrer" target="_blank">www.tarsnap.com</a> | Online backups for the truly paranoid<br> </blockquote></div>help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGOYWV8v%2Bq=F2rdtHewje_Eh6NrJeNyTX%2BnbLJPwnNa1OzoKYQ>