From nobody Fri Jul 22 00:27:47 2022 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 4Lpqyr0Vhkz4WjCt; Fri, 22 Jul 2022 00:27:48 +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 4Lpqyq6mPYz3FKp; Fri, 22 Jul 2022 00:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658449668; 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=RZsN8jJO4eMid3HLG88EPP4K/JjBHGjJ3LQchsc4Sng=; b=bmCVd9pxcJ1hv99fc1oaLjJELi1g5VJUZ5uF7AhUY50wfNbap+7/pGwuMO1TQBHbfWdU6r R7oKZc/brPytRfsLpihclLrUNavBbkPz3sAvASshRkyyhUtRlV1zPZjyYHQHOIS/u++OwL H9bbZDuIb7DuN8l9otEL/ck56nYHcmxZ6aKXx8A7gV/TquLGsZia9cw1PMXk3sAEBorzOe 3JnuJj8tKqdPbIamuR7IaU1Fndpl3NwR4fOAUr6m5yCtOCT9+y+mvJVx0G3XzWYLKKtb0n U/xPtxZTTIY38kFGEn+J8SzOQQ+QfFTlhphxBv+j2Z+meG5actrNrRWsn4wq5g== 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 4Lpqyq5py3zhct; Fri, 22 Jul 2022 00:27:47 +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 26M0RlGJ076362; Fri, 22 Jul 2022 00:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26M0Rl8P076361; Fri, 22 Jul 2022 00:27:47 GMT (envelope-from git) Date: Fri, 22 Jul 2022 00:27:47 GMT Message-Id: <202207220027.26M0Rl8P076361@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: 7beb8ffad4af - stable/13 - rc.conf.5: Improve documentation of _oomprotect 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/13 X-Git-Reftype: branch X-Git-Commit: 7beb8ffad4afb2197b6cad892d2da4bf2f88fbd6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658449668; 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=RZsN8jJO4eMid3HLG88EPP4K/JjBHGjJ3LQchsc4Sng=; b=jnDL2FnOYHG4rvnkVoqwhJVs85L35+8DhZCsJ3X2N89tRyrXVy0jXCRP0YiCZGu6LfF/pa 8dMW0WqhVq7LGSpyWLOPi8hFasjFERFTmkf/H6rDxGNoGmmVmwArJXxfDKe/T2k1L9jZq9 +eAdDC45la1Pis3cxYFjRRzbn+tuJ4HxBtKHf/AYnbhhF4JxUT3FdojqXQzdzpoZ5SwDdW N8lqVzOyPbGBzHP7mIbZS6gbX45+vVC0oN3lR/nVCrYflJexEXVWNRDiLKm5kQUW8q6t6p v6QGxCzBT4hq7GyGPlwRmWQnkvUGmrUUi8csuXhwX0s8E03oJ3nlkgC+fn2fdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658449668; a=rsa-sha256; cv=none; b=f5EITLDlYGEZGku55nTrB7kY5WK+5jL1EU1xuTQ83BIeGXPy3pOWD+vAspd3YHJWf0M3A+ WwnGEg2GeWkprkKJERbQoOoICb8MkSq0ZqlAqtm9tvXnkTF+r2JA4lFb0IYoXwM9kMfWfG tF1en15styhwjfZoRktoM1i76w1EA9iwnIy38LJ84d7unK7K/TAZQufHdA2frb4GZNtKTa nlfAxP1jSGYd77P4WEmzVBOoKik8/nrIHjdRIGeB1FtLqxOPKg4MVoa0eha+s+jH3q78qb MypRZMZO/GPVUcLQrnni/OrZnAU+EeSCYGNVF8o2x1BNEpWw44SBSsmqJ7VQMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=7beb8ffad4afb2197b6cad892d2da4bf2f88fbd6 commit 7beb8ffad4afb2197b6cad892d2da4bf2f88fbd6 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-07-07 18:01:57 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-07-22 00:25:23 +0000 rc.conf.5: Improve documentation of _oomprotect Apart from improving readability, this commit mentions that _oomprotect is ignored in a jail environment. Also, replace ${name}_cmd with the correct ${argument}_cmd and point the reader to rc.subr(8). MFC after: 1 week (cherry picked from commit df1817a81e891c4850157e7f21f94b113d663bec) --- share/man/man5/rc.conf.5 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index df772d567134..b8075576515f 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 28, 2022 +.Dd July 7, 2022 .Dt RC.CONF 5 .Os .Sh NAME @@ -221,6 +221,7 @@ The .Xr nice 1 value to run the service under. .It Ao Ar name Ac Ns Va _oomprotect +.Pq Vt str Use .Xr protect 1 to prevent the service from being killed when swap space @@ -229,13 +230,15 @@ Use .Dq Li YES to protect only the service itself, and .Dq Li ALL -to protect the service and all child processes. +to protect the service and all its child processes. .Pp -Please note rc scripts that redefine -.Bd -${name}_cmd -.Ed -such as PostgreSQL will not a inherit the OOM killer protection. +Please note that rc scripts which redefine +.Dl ${argument}_cmd +.Pq see Xr rc.subr 8 +such as PostgreSQL will not inherit the OOM killer protection. +.Pp +This variable has no effect on services running within a +.Xr jail 8 . .It Ao Ar name Ac Ns Va _user .Pq Vt str Run the service under this user account.