From nobody Sun Dec 05 16:56:30 2021 X-Original-To: dev-commits-src-all@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 BCB5618CF096; Sun, 5 Dec 2021 16:56:31 +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 4J6XlM1d5yz4Qy7; Sun, 5 Dec 2021 16:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 F355A1B994; Sun, 5 Dec 2021 16:56:30 +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 1B5GuUWa082707; Sun, 5 Dec 2021 16:56:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B5GuUer082706; Sun, 5 Dec 2021 16:56:30 GMT (envelope-from git) Date: Sun, 5 Dec 2021 16:56:30 GMT Message-Id: <202112051656.1B5GuUer082706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 3e63eaef8d8d - stable/12 - rc.subr.8: Document changes to load_rc_config List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3e63eaef8d8d58ea657704fef13956fd9541c658 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638723391; 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=3L0POD+BJF/62hom40J67oe96qaz1/+yHzrb1AKq9hw=; b=GfrkZjBILLc471kriE0foYl6L3mUW/S9pbJFsbR28Wm5j0QLTit483OE3x5aPaZZk3DqmZ 02aIkjOicfZzbKV9D8v6PfRHR2ZeId2GFhQmAD4rTlpzHuBPfCMDpVYEmLBq0fd2iYrAK0 +JC/HvglfynllCREr9vJhiYv/nMwZXPOtgNmT+UVIp63zgHbEMUf30TCZFS9q+R+YBtz+w 2rfwfF/vYwFKp1Tslc9S+MLLZ4mKW4NuWl0EQ7ceHbzZ2yJLnlJUNP9erwmsIvzZA6jdlh dG5kXu/qAlU51ammb4u8nZO5nucMr6o3bDYFtqAY0pmKapCoIgz2YFFmsbueUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638723391; a=rsa-sha256; cv=none; b=IG0ugO5q0C+7OOneVy5HXbvsETOEdppVlJGlLBvi44kl6ZguPaVZJNcqLRHGKoCoqpnCaj /DdpDL4oXdNJ+CN7gqu7UcW/Sy0phL91ebKe24VcRuFFlNYretvPOkXD4/JCaXKrprRI57 zXSa7uzNBxVo+DuKGN8ek/GT4qWMexfd4gMaBV2kJj/nY7rjpx8Zfj0ykgJNr5FVp9BL/J Cb25P/9xZ4e8R23qDfMdZAbwftdRR81k1OwZhQ5SVvNJwlmxGoMIo+tFb5/23gLWbXbjqB BXfrY/uboWe+WvlHr98IqsHcNxOcsLd3T5R4X/m0eqvo/REktF6KS5SZFPsHXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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