From nobody Thu Jul 07 18:10:18 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 AF3428D497A; Thu, 7 Jul 2022 18:10:19 +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 4Lf4Fk5Vykz3ph7; Thu, 7 Jul 2022 18:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657217418; 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=cxgiZgM2PZOTgxVVFfUxtkCSUbRw8u4XaxTOR1507A0=; b=d3LlnFi3UjIzfc92Fg7DJsXvm4fDM/jjWmmEAcPuaMG+kHizJmGownVwV2pVJ7Z97p/rGK a1e1xRIsU+TogWjo2tOwECxo7CWspks4VuKC1meSqzkwXZVBUVNk8kRzKOv/lHSPZJGQoU qdWJOgDa5/8xwh0BnmjoaCQCCeAe3KcvJLaOwvWHeSU0FkRHM3y9Zg7NEXIhSo7JZuu3q3 6v52VABzIvyNSERvBfyYfDqUZ1OiuvfK7vOiGqERCx/oYWjkGvnk58tl8FOAWnpQ0atUCD CVd6od0eRBOOhlZG/rC5+wDJG5/jcnYCMDwPKkhCzF5leoaoyckwgl02X/jFCg== 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 4Lf4Fk4ch7zsK2; Thu, 7 Jul 2022 18:10:18 +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 267IAI8s032069; Thu, 7 Jul 2022 18:10:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 267IAI8g032063; Thu, 7 Jul 2022 18:10:18 GMT (envelope-from git) Date: Thu, 7 Jul 2022 18:10:18 GMT Message-Id: <202207071810.267IAI8g032063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: df1817a81e89 - main - rc.conf.5: Improve documentation of _oomprotect 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df1817a81e891c4850157e7f21f94b113d663bec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657217418; 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=cxgiZgM2PZOTgxVVFfUxtkCSUbRw8u4XaxTOR1507A0=; b=eT/yzDiGz931iHx9TxCkyuS1iavVvqwZttclaj8QufZu/WviXHDKX2wb/Iu/+Hhar1Udy5 is71+lNhASaPCq2bdSGh6aKXscC9UiIaM32OMLkuG+p+FcYX1WQw7yFn2I5x8y7W2wBUfh eP8Y7NshilhaDH86DepEKx1kXYKE/s7sl/j289WYRKBLKOPftF0vxaw6riCOHn7XzQl2IS OTb7CvpbbINJEff/wpG3IAiu7j9GfB1CK1ui1aW2d1qMMJN/FK17eggHuTIoCHU4zXoIj6 18cIeYtBqImg4hgZ5qTr02MUhnE14dJQRk8y+xUdlqzex8eAfmcm2ZeF7klzUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657217418; a=rsa-sha256; cv=none; b=WHlrNrr3jZ3pI60ugdx2YSLaU+a/njuot97OPNHsUixuueZrHuOgVbse1UiZRHBiqMJAFo EVzDoYY486Lvy4/GKPz4qzmH8b61/lCtLiRar1XLc+2VpgEHjHyqiMDdAtiZEs1q0AAFNH 2bSe89bWfKlHnvng6W+f73AfgLXmGU1awMgzHgwU/vWc2f9QY7L2i3a7DuUtzlJlWAPakj jadckOJzinHBIukY/Pl/4M4sdTixdiZ03MZyo4POTG+k0Wa5obggrgVE6iLYl8wpYEkxwo 8HUQJQb63wWX4wZ7QEFyafwEaCfKoTv7I+Zmq1OOTVUK9xXhdMWp1HC6tC1GnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=df1817a81e891c4850157e7f21f94b113d663bec commit df1817a81e891c4850157e7f21f94b113d663bec Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-07-07 18:01:57 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-07-07 18:09:17 +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 --- share/man/man5/rc.conf.5 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 9c7af304b1f3..3c0bc297a8a0 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 -literal -${name}_cmd -.Ed +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.