Date: Sun, 5 Dec 2021 16:56:30 GMT From: Mateusz Piotrowski <0mp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 3e63eaef8d8d - stable/12 - rc.subr.8: Document changes to load_rc_config Message-ID: <202112051656.1B5GuUer082706@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=3e63eaef8d8d58ea657704fef13956fd9541c658 commit 3e63eaef8d8d58ea657704fef13956fd9541c658 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-11-29 15:02:32 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-12-05 16:45:31 +0000 rc.subr.8: Document changes to load_rc_config Since e27961a496322e2590da29f3c5fe710b269e6754, load_rc_config does not require a service name as its first argument. This change was documented in the rc.subr script in 0b9c2e7ac58caac0413aa36749e4c212514d142d. Let's update the manual page as well. MFC after: 3 days (cherry picked from commit 5d21348dfd95bdc19290dd172c5352e3787e86a5) --- share/man/man8/rc.subr.8 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index e96341b3e3fe..0b52784973fe 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 31, 2020 +.Dd November 29, 2021 .Dt RC.SUBR 8 .Os .Sh NAME @@ -59,7 +59,7 @@ .It .Ic load_kld Oo Fl e Ar regex Oc Oo Fl m Ar module Oc Ar file .It -.Ic load_rc_config Ar name +.Ic load_rc_config Op Ar service .It .Ic load_rc_config_var Ar name Ar var .It @@ -279,14 +279,18 @@ regular expression matching the module name can be supplied via By default, the module is assumed to have the same name as .Ar file , which is not always the case. -.It Ic load_rc_config Ar name -Source in the configuration files for -.Ar name . +.It Ic load_rc_config Op Ar service +Source in the configuration file(s) for +.Ar service . +If no +.Ar service +is specified, +only the global configuration file(s) will be loaded. First, .Pa /etc/rc.conf is sourced if it has not yet been read in. Then, -.Pa /etc/rc.conf.d/ Ns Ar name +.Pa /etc/rc.conf.d/ Ns Ar service is sourced if it is an existing file. The latter may also contain other variable assignments to override .Ic run_rc_command
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112051656.1B5GuUer082706>